From f8889f7364adae89e45a5ec3fcf4b38e430cf389 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 10 九月 2024 10:41:18 +0800
Subject: [PATCH] 工单详情

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java |   45 +++++++++++++++++++++++++--------------------
 1 files changed, 25 insertions(+), 20 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 f0e76b0..f23b814 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,16 +9,14 @@
 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 lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.io.Serializable;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -29,15 +26,13 @@
  * @date 2024-04-01
  */
 @Service
+@RequiredArgsConstructor
 public class ContractScoreServiceImpl extends ServiceImpl<ContractScoreMapper, ContractScore> implements IContractScoreService {
-    @Autowired
-    private ContractScoreMapper contractScoreMapper;
-    @Autowired
-    private YwUnitMapper ywunitMapper;
-    @Autowired
-    private TContractMapper contractMapper;
-    @Autowired
-    private CalculateRuleMapper calculateRuleMapper;
+
+    private final ContractScoreMapper contractScoreMapper;
+    private final YwUnitMapper ywunitMapper;
+    private final TContractMapper contractMapper;
+    private final CalculateRuleMapper calculateRuleMapper;
 
     /**
      * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
@@ -47,13 +42,23 @@
      */
     @Override
     public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
+        Integer unitId = SecurityUtils.getUnitId();
+        Long uid = null;
+        if (Objects.nonNull(unitId)) {
+            uid = Long.valueOf(unitId);
+        }
+        contractScore.setUnitId(uid);
         return contractScoreMapper.selectDefaultScoreList(contractScore);
     }
 
     @Override
     public ContractScore getById(Serializable id) {
+        //TODO:鍥炴樉浼樺寲
         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;
     }
 
@@ -63,17 +68,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