From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复

---
 ycl-server/src/main/java/com/ycl/platform/service/impl/ContractScoreServiceImpl.java |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 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 7e46a9c..22527b6 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
@@ -9,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 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.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -27,15 +27,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;
 
     /**
      * 鏌ヨ鍚堝悓鎵撳垎鍒楄〃
@@ -45,13 +43,39 @@
      */
     @Override
     public List<ContractScore> selectDefaultScoreList(ContractScore contractScore) {
+        //閬垮厤鎼滅储鏉′欢澶辨晥
+        if(contractScore.getUnitId()==null) {
+            //TODO:鏁版嵁鏉冮檺
+            Integer unitId = SecurityUtils.getUnitId();
+            Long uid = null;
+            if (Objects.nonNull(unitId)) {
+                uid = Long.valueOf(unitId);
+            }
+            contractScore.setUnitId(uid);
+        }
+        if(contractScore.getCreateStartTime()!=null) {
+            contractScore.setCreateStartTime(DateUtils.getDayStart(contractScore.getCreateStartTime()));
+        }
+        if(contractScore.getCreateEndTime()!=null) {
+            contractScore.setCreateEndTime(DateUtils.getDayStart(contractScore.getCreateEndTime()));
+        }
+        if(contractScore.getAuditingStartTime()!=null) {
+            contractScore.setAuditingStartTime(DateUtils.getDayStart(contractScore.getAuditingStartTime()));
+        }
+        if(contractScore.getAuditingEndTime()!=null) {
+            contractScore.setAuditingEndTime(DateUtils.getDayStart(contractScore.getAuditingEndTime()));
+        }
         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;
     }
 
@@ -61,14 +85,17 @@
         contractScore.setCreateUserId(user.getUserId());
         contractScore.setCreateUser(user.getNickName());
         contractScore.setAuditingStatus(AuditingStatus.WAIT);
-        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.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);
     }
 
@@ -90,8 +117,4 @@
                 .list();
     }
 
-    @Override
-    public List<Map<String, Object>> calculate() {
-        return contractScoreMapper.calculate();
-    }
 }

--
Gitblit v1.8.0