From 27bf1aad170bc78af274a596ce5c89caaa903ce3 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 04 九月 2024 03:34:45 +0800
Subject: [PATCH] 合同积分回显
---
ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java | 36 +++++++++++++-----------------------
1 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
index 6adf720..bf66b0a 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ycl.platform.domain.entity.CalculateRule;
import com.ycl.platform.domain.entity.ContractScore;
import com.ycl.platform.mapper.CalculateRuleMapper;
import com.ycl.platform.mapper.ContractScoreMapper;
@@ -10,15 +9,15 @@
import com.ycl.platform.mapper.YwUnitMapper;
import com.ycl.platform.service.IContractScoreService;
import com.ycl.system.entity.SysUser;
-import com.ycl.utils.DateUtils;
import com.ycl.utils.SecurityUtils;
import enumeration.general.AuditingStatus;
-import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import java.io.Serializable;
+import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;
@@ -47,25 +46,16 @@
*/
@Override
public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
- return new LambdaQueryChainWrapper<>(contractScoreMapper)
- .eq(ObjectUtils.isNotEmpty(contractScore.getUnitId()), ContractScore::getUnitId, contractScore.getUnitId())
- .between(ObjectUtils.isNotEmpty(contractScore.getCreateStartTime()), ContractScore::getCreateTime, contractScore.getCreateStartTime(), contractScore.getCreateEndTime())
- .between(ObjectUtils.isNotEmpty(contractScore.getAuditingStartTime()), ContractScore::getAuditingTime, contractScore.getAuditingStartTime(), contractScore.getAuditingEndTime())
- .eq(ObjectUtils.isNotEmpty(contractScore.getAuditingStatus()), ContractScore::getAuditingStatus, contractScore.getAuditingStatus())
- .orderByDesc(ContractScore::getCreateTime)
- .list()
- .stream().peek(
- item -> {
- item.setUnitName(ywunitMapper.selectById(item.getUnitId()).getUnitName());
- item.setContractName(contractMapper.selectById(item.getContractId()).getName());
- }
- ).toList();
+ return contractScoreMapper.selectDefaultScoreList(contractScore);
}
@Override
public ContractScore getById(Serializable id) {
ContractScore contractScore = super.getById(id);
- contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
+ List<String> ruleIds = new ArrayList<>();
+ ruleIds.add(contractScore.getRuleName().split("/")[0].trim());
+ ruleIds.add(contractScore.getRuleId()+"");
+ contractScore.setRuleIdsArray(ruleIds);
return contractScore;
}
@@ -75,17 +65,17 @@
contractScore.setCreateUserId(user.getUserId());
contractScore.setCreateUser(user.getNickName());
contractScore.setAuditingStatus(AuditingStatus.WAIT);
- contractScore.setDeleted("0");
- contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
- contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
- List<CalculateRule> list = new LambdaQueryChainWrapper<>(calculateRuleMapper).in(CalculateRule::getId, contractScore.getRuleIdsArray()).list();
- contractScore.setRuleName(String.join(" / ", new String[]{list.get(0).getRuleName(), list.get(1).getRuleDesc(), list.get(2).getRuleCondition()}));
+// contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
+// contractScore.setRuleIdsArray(Arrays.stream(contractScore.getRuleIds().split(",")).map(Long::parseLong).toArray(Long[]::new));
+ contractScore.setUpdateTime(new Date());
return super.save(contractScore);
}
@Override
public boolean updateById(ContractScore contractScore) {
- contractScore.setRuleIds(Arrays.stream(contractScore.getRuleIdsArray()).map(String::valueOf).collect(Collectors.joining(",")));
+ contractScore.setRuleId(Long.parseLong(contractScore.getRuleIdsArray().get(1)));
+ contractScore.setUpdateTime(new Date());
+ contractScore.setAuditingStatus(AuditingStatus.WAIT);
return super.updateById(contractScore);
}
--
Gitblit v1.8.0