feature 代码提交

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/PredictionScoreService.java

@@ -0,0 +1,13 @@
+package com.rongwei.bscommon.sys.service;
+
+import com.rongwei.rwcommon.base.R;
+
+/**
+ * PredictionScoreService class
+ *
+ * @author XH
+ * @date 2024/12/14
+ */
+public interface PredictionScoreService {
+    R generateData(String id);
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/ExamineServiceImpl.java

@@ -66,12 +66,14 @@ public class ExamineServiceImpl implements ExamineService {
         List<JtYcpfhzDetail> oldData = jtYcpfhzDetailService.list(new LambdaQueryWrapper<JtYcpfhzDetail>()
                 .eq(JtYcpfhzDetail::getDataid, "0")
                 .eq(JtYcpfhzDetail::getYcpfhzid, id));
-        // 根据管理单位获取 考核部门信息
-        List<String> list = Arrays.asList(khzbNum.split(","));
+        List<String> list = new ArrayList<>();
+        if(StringUtils.isNotBlank(khzbNum)){
+            list= Arrays.asList(khzbNum.split(","));
+        }
         // 获取考核规则
         List<JkAssessmentRules> jkAssessmentRules = jkAssessmentRulesService.list(new LambdaQueryWrapper<JkAssessmentRules>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(StringUtils.isNotBlank(khzbNum), JkAssessmentRules::getNum, list)
+                .in(StringUtils.isNotBlank(khzbNum), JkAssessmentRules::getNum,list)
                 .orderByAsc(JkAssessmentRules::getNum));
         if (jkAssessmentRules.isEmpty()) {
             throw new CustomException("获取获取到考核规则信息");
@@ -83,20 +85,20 @@ public class ExamineServiceImpl implements ExamineService {
                 .eq(JtXmkh::getYear, year)
                 .eq(JtXmkh::getGldw, gldw)
                 .eq(JtXmkh::getReportstatus, "已发布"));
-        // 获取考核部门下的所有考核项目信息
-        List<JtKhxm> jtKhxmList = jtKhxmService.list(new LambdaQueryWrapper<JtKhxm>()
-                .eq(BaseDo::getDeleted, "0")
-                .in(JtKhxm::getMainid, khbmList.stream().map(JtXmkh::getGldw)));
+//        // 获取考核部门下的所有考核项目信息
+//        List<JtKhxm> jtKhxmList = jtKhxmService.list(new LambdaQueryWrapper<JtKhxm>()
+//                .eq(BaseDo::getDeleted, "0")
+//                .in(JtKhxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         // 公司考核管理填报数据
-        JtGsjtbsj jtGsjtbsj = jtGsjtbsjService.getOne(new LambdaQueryWrapper<JtGsjtbsj>()
-                .eq(BaseDo::getDeleted, "0")
-                .eq(JtGsjtbsj::getYear, year)
-                .eq(JtGsjtbsj::getGldw, gldw), false);
+        JtGsjtbsj jtGsjtbsj = jtGsjtbsjService.getById(jtYcpfhz.getMainid());
+        if(jtGsjtbsj==null){
+            throw new CustomException("无法获取到公司考核管理数据");
+        }
         List<JtYcpfhzDetail> saveData = new ArrayList<>();
         SysUserVo currentUser = JXKHUtils.getCurrentUser();
         jkAssessmentRules.forEach(rule -> {
             ScoreCalculationService scoreCalculationService = SpringContextUtils.getBean("scoreCalculationServiceNum" + rule.getNum());
-            saveData.add(scoreCalculationService.soreCalculation(jtYcpfhz, khbmList, jtKhxmList, jtGsjtbsj, rule, currentUser));
+            saveData.add(scoreCalculationService.soreCalculation(jtYcpfhz, khbmList, jtGsjtbsj, rule, currentUser));
         });
         List<String> removeIds = new ArrayList<>();
         // 不为空 先删除旧数据 在新增

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/service/impl/PredictionScoreServiceImpl.java

@@ -0,0 +1,83 @@
+package com.rongwei.bscommon.sys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.rongwei.bscommon.sys.service.PredictionScoreService;
+import com.rongwei.bsentity.domain.JkAssessmentRules;
+import com.rongwei.bsentity.domain.JtGsjtbsj;
+import com.rongwei.bsentity.domain.JtYcpfhz;
+import com.rongwei.bsentity.domain.JtYcpfhzDetail;
+import com.rongwei.rwadmincommon.system.vo.SysUserVo;
+import com.rongwei.rwcommon.base.R;
+import com.rongwei.rwcommon.base.exception.CustomException;
+import com.rongwei.rwcommon.utils.SecurityUtil;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.getCurrentUser;
+import static com.rongwei.bscommon.sys.utils.JXKHUtils.initModelGeneralParameters;
+
+/**
+ * PredictionScoreServiceImpl class
+ *
+ * @author XH
+ * @date 2024/12/14
+ */
+@Service
+public class PredictionScoreServiceImpl implements PredictionScoreService {
+    @Autowired
+    private JtGsjtbsjServiceImpl jtGsjtbsjService;
+    @Autowired
+    private JkAssessmentRulesServiceImpl jkAssessmentRulesService;
+    @Autowired
+    private JtYcpfhzServiceImpl jtYcpfhzService;
+    @Autowired
+    private JtYcpfhzDetailServiceImpl jtYcpfhzDetailService;
+
+    @Override
+    public R generateData(String id) {
+        JtGsjtbsj jtGsjtbsj = jtGsjtbsjService.getById(id);
+        if (jtGsjtbsj == null) {
+            throw new CustomException("无法获取公司考核管理信息");
+        }
+
+        JtYcpfhz jtYcpfhz = jtYcpfhzService.getOne(new LambdaQueryWrapper<JtYcpfhz>()
+                .eq(JtYcpfhz::getMainid,id), false);
+        if (jtYcpfhz != null) {
+            return R.ok();
+        }
+        SysUserVo currentUser = getCurrentUser();
+        /***************生成主表********************/
+        jtYcpfhz = new JtYcpfhz();
+        jtYcpfhz.setId(SecurityUtil.getUUID());
+        jtYcpfhz.setMainid(jtGsjtbsj.getId());
+        jtYcpfhz.setYear(jtGsjtbsj.getYear());
+        jtYcpfhz.setGldw(jtGsjtbsj.getGldw());
+        initModelGeneralParameters(jtGsjtbsj, currentUser);
+        jtYcpfhzService.save(jtYcpfhz);
+        /***************子表生成********************/
+        List<JtYcpfhzDetail> jtYcpfhzDetails= new ArrayList<>();
+        JtYcpfhzDetail jtYcpfhzDetail;
+        List<JkAssessmentRules> rulesList = jkAssessmentRulesService.list();
+        for (JkAssessmentRules jkAssessmentRules : rulesList) {
+            jtYcpfhzDetail = new JtYcpfhzDetail();
+            jtYcpfhzDetail.setId(SecurityUtil.getUUID());
+            jtYcpfhzDetail.setKhxmflyj(jkAssessmentRules.getCategorylevel1());
+            jtYcpfhzDetail.setKhxmflej(jkAssessmentRules.getCategorylevel2());
+            jtYcpfhzDetail.setQzf(jkAssessmentRules.getWeight());
+            jtYcpfhzDetail.setYcsj(new Date());
+            jtYcpfhzDetail.setKhxz(jkAssessmentRules.getAssessmentdetails());
+            jtYcpfhzDetail.setZbnr(jkAssessmentRules.getCategorylevel3());
+            jtYcpfhzDetail.setYcpfhzid(jtYcpfhz.getId());
+            jtYcpfhzDetail.setSortno(jkAssessmentRules.getNum());
+            jtYcpfhzDetail.setRemark(jkAssessmentRules.getRemark());
+            initModelGeneralParameters(jtYcpfhzDetail, currentUser);
+            jtYcpfhzDetails.add(jtYcpfhzDetail);
+        }
+        jtYcpfhzDetailService.saveBatch(jtYcpfhzDetails);
+        return R.ok();
+    }
+}

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationService.java

@@ -18,7 +18,7 @@ import java.util.List;
 public interface ScoreCalculationService {
 
     JtYcpfhzDetail soreCalculation(
-            JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser);
+            JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser);
 
     /**
      * 组织评分汇总信息
@@ -45,6 +45,7 @@ public interface ScoreCalculationService {
         jtYcpfhzDetail.setYcpfhzid(jtYcpfhz.getId());
         jtYcpfhzDetail.setSortno(jkAssessmentRules.getNum());
         jtYcpfhzDetail.setRemark(jkAssessmentRules.getRemark());
+        jtYcpfhzDetail.setYcpfhzid(jtYcpfhz.getId());
         JXKHUtils.initModelGeneralParameters(jtYcpfhzDetail, currentUser);
         return jtYcpfhzDetail;
     }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum1.java

@@ -40,7 +40,7 @@ public class ScoreCalculationServiceNum1 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 默认得分
@@ -60,7 +60,7 @@ public class ScoreCalculationServiceNum1 implements ScoreCalculationService {
         // 分级管理项目清单
         List<JtFjglxm> fjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (fjglxmList.isEmpty()) {
             errorMsg = "项目级:暂无项目信息不扣分";
             finalScore = finalScore.subtract(THREE_SOURCE);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum10.java

@@ -40,7 +40,7 @@ public class ScoreCalculationServiceNum10 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -56,7 +56,7 @@ public class ScoreCalculationServiceNum10 implements ScoreCalculationService {
         // 获取审查审定率 数据
         List<JtScsdl> jtScsdls = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (jtScsdls.isEmpty()) {
             finalScore = finalScore.subtract(TWO_SOURCE);
             errorMsg = "项目级:无法获取审查审定率";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum11.java

@@ -41,7 +41,7 @@ public class ScoreCalculationServiceNum11 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -57,7 +57,7 @@ public class ScoreCalculationServiceNum11 implements ScoreCalculationService {
         // 获取审查审定率 数据
         List<JtWtbhgl> jtWtbhglList = jtWtbhglService.list(new LambdaQueryWrapper<JtWtbhgl>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtWtbhgl::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtWtbhgl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (jtWtbhglList.isEmpty()) {
             errorMsg = "项目级：未获取到问题闭环管理数据";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum12.java

@@ -41,7 +41,7 @@ public class ScoreCalculationServiceNum12 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -57,7 +57,7 @@ public class ScoreCalculationServiceNum12 implements ScoreCalculationService {
         // 获取审查审定率 数据
         List<JtScbhgl> jtScbhglList = jtScbhglService.list(new LambdaQueryWrapper<JtScbhgl>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtScbhgl::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtScbhgl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (jtScbhglList.isEmpty()) {
             errorMsg = "项目级：未获取到审查闭环管理数据";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum13.java

@@ -57,7 +57,7 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -65,7 +65,7 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
         // 获取考核项目信息 计划完成时间”在考核区间内且中标主体为二级单位以上的项目
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .between(JtFjglxm::getJhwcsj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
         if (khxmList.isEmpty()) {
             errorMsg = "公司级：分级管理-项目清单为空";
@@ -73,7 +73,7 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 获取勘察设计项目清单 计划内项目的总数量 “计划完成时间”（分级管理-项目清单）在考核区间内且中标主体为二级单位及以上且在勘察设计项目工作清单内的项目数量。
-        List<JtKcsjxm> gcsjqd = jtKcsjxmService.list(new LambdaQueryWrapper<JtKcsjxm>().eq(BaseDo::getDeleted, "0").in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId)).in(JtKcsjxm::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc)));
+        List<JtKcsjxm> gcsjqd = jtKcsjxmService.list(new LambdaQueryWrapper<JtKcsjxm>().eq(BaseDo::getDeleted, "0").in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId)).in(JtKcsjxm::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList())));
         // 获取分母 计划内项目的总数量
         List<String> denominator = gcsjqd.stream().map(JtKcsjxm::getXmmc).distinct().collect(Collectors.toList());
         if (denominator.isEmpty()) {
@@ -82,7 +82,7 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 获取已完成审查的项目数量 分子
-        List<JtScsdl> ywcscList = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>().eq(BaseDo::getDeleted, "0").in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId)).in(JtScsdl::getXmmc, gcsjqd.stream().map(JtKcsjxm::getXmmc)).between(JtScsdl::getPzsj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
+        List<JtScsdl> ywcscList = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>().eq(BaseDo::getDeleted, "0").in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId)).in(JtScsdl::getXmmc, gcsjqd.stream().map(JtKcsjxm::getXmmc).collect(Collectors.toList())).between(JtScsdl::getPzsj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
         // 分子 已审定的项目数量： 最终节点审定责任人（审查审定-审查审定率）、批准时间（审查审定-审查审定率）不为空的且批准时间在考核区间内的项目数量
         List<String> numerator = ywcscList.stream().filter(data -> StringUtils.isNotBlank(data.getZzjdsdzrr()) && data.getPzsj() != null).map(JtScsdl::getXmmc).distinct().collect(Collectors.toList());
         if (numerator.isEmpty()) {

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum14.java

@@ -41,7 +41,7 @@ public class ScoreCalculationServiceNum14 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -52,7 +52,7 @@ public class ScoreCalculationServiceNum14 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .eq(JtFjglxm::getSfsjsggl, "0")
         );
         if (khxmList.isEmpty()) {
@@ -61,8 +61,8 @@ public class ScoreCalculationServiceNum14 implements ScoreCalculationService {
         }
         List<JtScsdl> jtScsdls = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>().eq(BaseDo::getDeleted, "0")
                 .eq(JtScsdl::getDeleted, "0")
-                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId))
-                .in(JtScsdl::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc))
+                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
+                .in(JtScsdl::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList()))
         );
         List<String> projectNameList = jtScsdls.stream().filter(data -> data.getQzsj() == null).map(JtScsdl::getXmmc).distinct().collect(Collectors.toList());
         if (projectNameList.isEmpty()) {

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum15.java

@@ -54,7 +54,7 @@ public class ScoreCalculationServiceNum15 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -62,7 +62,7 @@ public class ScoreCalculationServiceNum15 implements ScoreCalculationService {
         // 考核范围：“计划开始时间”在考核区间内且中标主体为二级单位以上的项目。
         List<JtFjglxm> jtFjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .eq(JtFjglxm::getSfsjsggl, "0")
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(),
                         jtGsjtbsj.getAssessmentendtime()));
@@ -73,15 +73,15 @@ public class ScoreCalculationServiceNum15 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         List<JtKcsjxm> list = jtKcsjxmService.list(new LambdaQueryWrapper<JtKcsjxm>().eq(BaseDo::getDeleted, "0")
-                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId))
-                .in(JtKcsjxm::getXmmc, jtFjglxmList.stream().map(JtFjglxm::getXmmc)));
+                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
+                .in(JtKcsjxm::getXmmc, jtFjglxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList())));
         List<String> denominator = list.stream().map(JtKcsjxm::getXmmc).distinct().collect(Collectors.toList());
 
         //已批准的EPC项目数量：最终节点审定责任人（审查审定-审查审定率）、批准时间（审查审定-审查审定率）不为空且是否涉及施工管理为是（分级管理-项目清单）的项目数量。
         List<JtScsdl> jtScsdls = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId))
-                .in(JtScsdl::getXmmc, jtFjglxmList.stream().map(JtFjglxm::getXmmc)));
+                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
+                .in(JtScsdl::getXmmc, jtFjglxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList())));
         List<String> numerator = jtScsdls.stream().filter(data -> StringUtils.isNotBlank(data.getZzjdsdzrr()) && data.getPzsj() != null)
                 .map(JtScsdl::getXmmc)
                 .distinct()

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum16.java

@@ -52,7 +52,7 @@ public class ScoreCalculationServiceNum16 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -60,7 +60,7 @@ public class ScoreCalculationServiceNum16 implements ScoreCalculationService {
         // 考核范围：“计划开始时间”在考核区间内且中标主体为二级单位以上的项目
         List<JtFjglxm> jtFjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .eq(JtFjglxm::getSfsjsggl, "0")
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(),
                         jtGsjtbsj.getAssessmentendtime()));
@@ -71,8 +71,8 @@ public class ScoreCalculationServiceNum16 implements ScoreCalculationService {
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         List<JtKcsjxm> list = jtKcsjxmService.list(new LambdaQueryWrapper<JtKcsjxm>().eq(BaseDo::getDeleted, "0")
-                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId))
-                .in(JtKcsjxm::getXmmc, jtFjglxmList.stream().map(JtFjglxm::getXmmc)));
+                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
+                .in(JtKcsjxm::getXmmc, jtFjglxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList())));
         //EPC项目数量
         List<String> denominator = list.stream().map(JtKcsjxm::getXmmc).distinct().collect(Collectors.toList());
 

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum17.java

@@ -17,6 +17,7 @@ import java.math.RoundingMode;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
@@ -58,7 +59,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -74,7 +75,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
                 .eq(JtFjglxm::getZbztdj, "0")
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(),
                         jtGsjtbsj.getAssessmentendtime())
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (jtFjglxmList.isEmpty()) {
             errorMsg = "项目级：无法获取到分级管理项目清单";
             finalScore = finalScore.subtract(TWO_SOURCE);
@@ -83,7 +84,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
         // 设计交底清单数据
         List<JtSjjdqd> jtSjjdqdList = jtSjjdqdService.list(new LambdaQueryWrapper<JtSjjdqd>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtSjjdqd::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtSjjdqd::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (jtSjjdqdList.isEmpty()) {
             errorMsg = "项目级：无法获取到设计交底清单";
             finalScore = finalScore.subtract(TWO_SOURCE);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum18.java

@@ -42,7 +42,7 @@ public class ScoreCalculationServiceNum18 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -54,7 +54,7 @@ public class ScoreCalculationServiceNum18 implements ScoreCalculationService {
         }
         List<JtSjbgqd> jtSjbgqdList = jtSjbgqdService.list(new LambdaQueryWrapper<JtSjbgqd>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtSjbgqd::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtSjbgqd::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         List<String> projectName = jtSjbgqdList.stream().filter(data -> (StringUtils.isNotBlank(data.getBgtcr()) && data.getBgtcsj() != null) &&
                         (StringUtils.isNotBlank(data.getBgfzr()) || data.getBgpzsj() == null))
                 .map(JtSjbgqd::getXmmc).distinct().collect(Collectors.toList());
@@ -70,7 +70,7 @@ public class ScoreCalculationServiceNum18 implements ScoreCalculationService {
         List<JtFjglxm> fjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getSfxxyw, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         List<String> collect = jtSjbgqdList.stream().filter(data -> StringUtils.isNotBlank(data.getSjgcsshzj())).map(JtSjbgqd::getXmmc).collect(Collectors.toList());
         if (collect.isEmpty()) {
             errorMsg = errorMsg + "项目级:暂无首件工程实施和总结为空的项目";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum19.java

@@ -41,7 +41,7 @@ public class ScoreCalculationServiceNum19 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum2.java

@@ -44,7 +44,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -71,7 +71,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
         // 勘察设计项目清单
         List<JtKcsjxm> kcsjxmList = jtKcsjxmService.list(new LambdaQueryWrapper<JtKcsjxm>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (kcsjxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
             errorMsg = errorMsg + "公司级：无法获取勘察设计项目清单";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum20.java

@@ -49,7 +49,7 @@ public class ScoreCalculationServiceNum20 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
@@ -83,7 +83,7 @@ public class ScoreCalculationServiceNum20 implements ScoreCalculationService {
         List<JtFjglxm> fjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getSfxxyw, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (!fjglxmList.isEmpty() && list.stream().anyMatch(info -> StringUtils.isBlank(info.getXxywpxryqd()))) {
             finalScore = finalScore.subtract(ZERO_POINT_FIVE_SOURCE);
             errorMsg = errorMsg + "公司级: 存在新兴业务项目,但新兴业务培训人员清单为空";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum21.java

@@ -41,7 +41,7 @@ public class ScoreCalculationServiceNum21 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum22.java

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.THREE_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
@@ -44,7 +45,7 @@ public class ScoreCalculationServiceNum22 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -78,7 +79,7 @@ public class ScoreCalculationServiceNum22 implements ScoreCalculationService {
         List<JtFjglxm> list2 = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getSfxxyw, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (!list2.isEmpty()){
             long count = list.stream().filter(item -> ObjectUtil.isNotEmpty(item.getJhlxsfhgjsbzh()) && item.getJhlxsfhgjsbzh().equals("0")).count();
             if (count == 0) {

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum23.java

@@ -45,7 +45,7 @@ public class ScoreCalculationServiceNum23 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -63,7 +63,7 @@ public class ScoreCalculationServiceNum23 implements ScoreCalculationService {
         //计划数量：年度计划列表中数量。
         long totalCount = list.size();
         //计划执行率=实际时间在计划完成时间内数量/计划数量 结果取小数点后一位。
-        BigDecimal planExecutionRate = new BigDecimal(goodCount).divide(new BigDecimal(totalCount), 1, RoundingMode.HALF_UP);
+        BigDecimal planExecutionRate =calculateApprovalRate((int)totalCount,(int)goodCount);
         //计划执行率≥80%，不扣分。
         //其他数值线性计算得分，得分取小数点后三位。
         if (planExecutionRate.compareTo(new BigDecimal("0.8")) >= 0) {
@@ -83,4 +83,20 @@ public class ScoreCalculationServiceNum23 implements ScoreCalculationService {
         }
         return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
     }
+
+    /**
+     * 计算审查审定率
+     * @param denominator
+     * @param numerator
+     * @return
+     */
+    public BigDecimal calculateApprovalRate(int denominator, int numerator) {
+        if(denominator==0){
+            return BigDecimal.ZERO;
+        }
+        if(numerator==0){
+            return BigDecimal.ZERO;
+        }
+        return BigDecimal.valueOf(numerator).divide(BigDecimal.valueOf(denominator), 6, RoundingMode.HALF_UP).multiply(new BigDecimal("100")).setScale(3, RoundingMode.HALF_UP);
+    }
 }

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum24.java

@@ -33,7 +33,7 @@ public class ScoreCalculationServiceNum24 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum25.java

@@ -35,7 +35,7 @@ public class ScoreCalculationServiceNum25 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum26.java

@@ -14,6 +14,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
 
@@ -41,7 +42,7 @@ public class ScoreCalculationServiceNum26 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -52,11 +53,11 @@ public class ScoreCalculationServiceNum26 implements ScoreCalculationService {
         List<JtFjglxm> list = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(JtFjglxm::getDeleted, "0")
                 .eq(JtFjglxm::getSfzdxm, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (!list.isEmpty()) {
             List<JtZdxmszmn> list2 = jtZdxmszmnService.list(new LambdaQueryWrapper<JtZdxmszmn>()
                     .eq(JtZdxmszmn::getDeleted, "0")
-                    .in(JtZdxmszmn::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                    .in(JtZdxmszmn::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
             List<String> xmcmList = new LinkedList<>();
             for (JtZdxmszmn jtZdxmszmn : list2) {
                 if (xmcmList.contains(jtZdxmszmn.getXmmc())) {

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum27.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
@@ -50,7 +51,7 @@ public class ScoreCalculationServiceNum27 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -59,7 +60,7 @@ public class ScoreCalculationServiceNum27 implements ScoreCalculationService {
         String errorMsg = "";
         List<JtXcjhqd> list = jtXcjhqdService.list(new LambdaQueryWrapper<JtXcjhqd>()
                 .eq(JtXcjhqd::getDeleted, "0")
-                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         //计划被巡查单位数量：巡查清单中被巡查单位的数量。
         long count = list.stream().filter(item -> ObjectUtil.isNotEmpty(item.getBxcdw())).distinct().count();
         Integer planCount = Math.toIntExact(count);
@@ -94,7 +95,7 @@ public class ScoreCalculationServiceNum27 implements ScoreCalculationService {
         int xxywxmCount = jtFjglxmService.count(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(JtFjglxm::getDeleted, "0")
                 .eq(JtFjglxm::getSfxxyw, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (xxywxmCount > 0 && list.isEmpty()) {
             finalScore = finalScore.subtract(BigDecimal.ONE);
             errorMsg = errorMsg + "公司级:项目符合“是否属于新兴业务项目”=是（分级管理-项目清单），巡查计划清单中不存在记录";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum28.java

@@ -12,6 +12,7 @@ import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.ZERO_POINT_FIVE_SOURCE;
@@ -48,7 +49,7 @@ public class ScoreCalculationServiceNum28 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -58,7 +59,7 @@ public class ScoreCalculationServiceNum28 implements ScoreCalculationService {
 
         List<JtXcjhqd> list = jtXcjhqdService.list(new LambdaQueryWrapper<JtXcjhqd>()
                 .eq(JtXcjhqd::getDeleted, "0")
-                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         //已巡查项目数量：问题整改日期非空的项目数量。
         long checkedCount = list.stream().filter(info -> ObjectUtil.isNotEmpty(info.getWtzgrq())).count();
         //计划巡查数量：巡查清单的项目数量。

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum29.java

@@ -13,6 +13,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.ZERO_POINT_FIVE_SOURCE;
@@ -40,7 +41,7 @@ public class ScoreCalculationServiceNum29 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -50,7 +51,7 @@ public class ScoreCalculationServiceNum29 implements ScoreCalculationService {
 
         List<JtXcjhqd> list = jtXcjhqdService.list(new LambdaQueryWrapper<JtXcjhqd>()
                 .eq(JtXcjhqd::getDeleted, "0")
-                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtXcjhqd::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         //巡查通报文件为空扣2分。
         long count = list.stream().filter(info -> ObjectUtil.isEmpty(info.getXctbwj())).count();
         if (count > 0) {

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum3.java

@@ -47,7 +47,7 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
      */
     @Override
     @Synchronized
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList,
                                           JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
@@ -67,7 +67,7 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
 
         if (khxmList.isEmpty()) {
@@ -78,8 +78,8 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
         // 获取勘察工作大纲
         List<JtGzdg> gzdgList = jtGzdgService.list(new LambdaQueryWrapper<JtGzdg>().eq(BaseDo::getDeleted, "0")
                 .eq(JtGzdg::getType, "0") //勘察工作大纲
-                .in(JtGzdg::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc))
-                .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtGzdg::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList()))
+                .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (gzdgList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
             errorMsg = errorMsg + "无法获取到勘察工作大纲";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum30.java

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.TWO_SOURCE;
 
@@ -40,7 +41,7 @@ public class ScoreCalculationServiceNum30 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -60,7 +61,7 @@ public class ScoreCalculationServiceNum30 implements ScoreCalculationService {
         // “是否为新兴业务项目”=是（分级管理-项目清单）且是否为新兴业务专家为否，扣0.5分
         List<JtFjglxm> list = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(JtFjglxm::getDeleted, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .eq(JtFjglxm::getSfxxyw, "0"));
         if (!list.isEmpty()) {
             List<JtZjfjflqd> list2 = jtZjfjflqdService.list(new LambdaQueryWrapper<JtZjfjflqd>()

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum31.java

@@ -37,7 +37,7 @@ public class ScoreCalculationServiceNum31 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum32.java

@@ -39,7 +39,7 @@ public class ScoreCalculationServiceNum32 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum33.java

@@ -12,6 +12,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.*;
 
@@ -41,7 +42,7 @@ public class ScoreCalculationServiceNum33 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -63,7 +64,7 @@ public class ScoreCalculationServiceNum33 implements ScoreCalculationService {
         // 获取考核项目信息
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (khxmList.isEmpty()) {
             finalScore = finalScore.subtract(TWO_SOURCE);
             errorMsg = errorMsg + "项目级：没有（分级管理-项目清单）数据。";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum34.java

@@ -36,7 +36,7 @@ public class ScoreCalculationServiceNum34 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         List<JtYxwjfbqd> list = jtYxwjfbqdService.list(new LambdaQueryWrapper<JtYxwjfbqd>().eq(JtYxwjfbqd::getDeleted, "0").eq(JtYxwjfbqd::getMainid, jtGsjtbsj.getId()));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum35.java

@@ -32,7 +32,7 @@ public class ScoreCalculationServiceNum35 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
 

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum36.java

@@ -38,7 +38,7 @@ public class ScoreCalculationServiceNum36 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         List<JtJsglcgqd> list = jtJsglcgqdService.list(new LambdaQueryWrapper<JtJsglcgqd>().eq(JtJsglcgqd::getDeleted, "0").eq(JtJsglcgqd::getMainid, jtGsjtbsj.getId()));

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum37.java

@@ -32,7 +32,7 @@ public class ScoreCalculationServiceNum37 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum38.java

@@ -30,7 +30,7 @@ public class ScoreCalculationServiceNum38 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum3Deprecated.java

@@ -30,7 +30,7 @@ public class ScoreCalculationServiceNum3Deprecated implements ScoreCalculationSe
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum4.java

@@ -47,7 +47,7 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
      */
     @Override
     @Synchronized
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList,
                                           JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
@@ -67,7 +67,7 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
         if (khxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
@@ -77,8 +77,8 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
         // 获取勘察工作大纲
         List<JtGzdg> gzdgList = jtGzdgService.list(new LambdaQueryWrapper<JtGzdg>().eq(BaseDo::getDeleted, "0")
                 .eq(JtGzdg::getType, "2") //勘察设计指导书
-                .in(JtGzdg::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc))
-                .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtGzdg::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList()))
+                .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (gzdgList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
             errorMsg = errorMsg + "无法获取到勘察工作大纲";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum5.java

@@ -47,7 +47,7 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
      */
     @Override
     @Synchronized
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList,
                                           JtGsjtbsj jtGsjtbsj, JkAssessmentRules jkAssessmentRules, SysUserVo currentUser) {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
@@ -66,7 +66,7 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
         if (khxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
@@ -76,8 +76,8 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
         // 获取勘察工作大纲
         List<JtGzdg> gzdgList = jtGzdgService.list(new LambdaQueryWrapper<JtGzdg>().eq(BaseDo::getDeleted, "0")
                 .eq(JtGzdg::getType, "1") //勘察设计指导书
-                .in(JtGzdg::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc))
-                .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtGzdg::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList()))
+                .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (gzdgList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
             errorMsg = errorMsg + "无法获取到勘察工作大纲";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum6.java

@@ -37,7 +37,7 @@ public class ScoreCalculationServiceNum6 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -52,7 +52,7 @@ public class ScoreCalculationServiceNum6 implements ScoreCalculationService {
         // 总体方案评审清单
         List<JtZtfaps> ztfapsList = ztfapsService.list(new LambdaQueryWrapper<JtZtfaps>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtZtfaps::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtZtfaps::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (ztfapsList.isEmpty()) {
             errorMsg = "项目级：总体方案评审清单为空";
             finalScore = finalScore.subtract(FOUR_SOURCE);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum7.java

@@ -40,7 +40,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -51,7 +51,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
         // 总体方案评审清单
         List<JtWyys> ztfapsList = jtWyysService.list(new LambdaQueryWrapper<JtWyys>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtWyys::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtWyys::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (ztfapsList.isEmpty()) {
             errorMsg = "项目级：外业验收清单为空";
             finalScore = finalScore.subtract(FOUR_SOURCE);

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum8.java

@@ -39,7 +39,7 @@ public class ScoreCalculationServiceNum8 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -55,7 +55,7 @@ public class ScoreCalculationServiceNum8 implements ScoreCalculationService {
         // 意见清单为空
         List<JtYjbhgl> jtYjbhglList = jtYjbhglService.list(new LambdaQueryWrapper<JtYjbhgl>()
                 .eq(BaseDo::getDeleted, "0")
-                .in(JtYjbhgl::getMainid, khbmList.stream().map(JtXmkh::getId)));
+                .in(JtYjbhgl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
 
         if (jtYjbhglList.isEmpty()) {
             errorMsg = "项目级：外业验收清单为空";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/strategy/scoreCalculation/ScoreCalculationServiceNum9.java

@@ -14,6 +14,7 @@ import org.springframework.stereotype.Service;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static com.rongwei.bscommon.sys.utils.JXKHConstant.DefaultSource.FOUR_SOURCE;
 import static com.rongwei.bscommon.sys.utils.JXKHUtils.CALCULATE_Y3;
@@ -53,7 +54,7 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
      * @return
      */
     @Override
-    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, List<JtKhxm> jtKhxmList, JtGsjtbsj jtGsjtbsj,
+    public JtYcpfhzDetail soreCalculation(JtYcpfhz jtYcpfhz, List<JtXmkh> khbmList, JtGsjtbsj jtGsjtbsj,
                                           JkAssessmentRules jkAssessmentRules,
                                           SysUserVo currentUser) {
         // 考核得分
@@ -64,7 +65,7 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
-                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId))
+                .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
         if (khxmList.isEmpty()) {
             finalScore = finalScore.subtract(FOUR_SOURCE);
@@ -73,8 +74,8 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
         }
         // 获取勘察设计项目清单 项目总数量 分母
         List<JtKcsjxm> gcsjqd = jtKcsjxmService.list(new LambdaQueryWrapper<JtKcsjxm>().eq(BaseDo::getDeleted, "0")
-                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId))
-                .in(JtKcsjxm::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc)));
+                .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
+                .in(JtKcsjxm::getXmmc, khxmList.stream().map(JtFjglxm::getXmmc).collect(Collectors.toList())));
         if (gcsjqd.isEmpty()) {
             finalScore = finalScore.subtract(FOUR_SOURCE);
             errorMsg = "项目级: 无法获取到计划内的项目";
@@ -82,8 +83,8 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
         }
         // 获取已完成审查的项目数量 分子
         List<JtScsdl> ywcscList = jtScsdlService.list(new LambdaQueryWrapper<JtScsdl>().eq(BaseDo::getDeleted, "0")
-                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId))
-                .in(JtScsdl::getXmmc, gcsjqd.stream().map(JtKcsjxm::getXmmc)));
+                .in(JtScsdl::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
+                .in(JtScsdl::getXmmc, gcsjqd.stream().map(JtKcsjxm::getXmmc).collect(Collectors.toList())));
         if (ywcscList.isEmpty()) {
             finalScore = finalScore.subtract(FOUR_SOURCE);
             errorMsg = "项目级: 未找到已完成审查的项目信息";

jsglkh-common/src/main/java/com/rongwei/bscommon/sys/utils/JXKHUtils.java

@@ -54,10 +54,12 @@ public class JXKHUtils {
         }
         t.setCreatedate(new Date());
         t.setModifydate(new Date());
-        t.setCreateuserid(userVo.getId());
-        t.setCreateusername(userVo.getName());
-        t.setModifyuserid(userVo.getId());
-        t.setModifyusername(userVo.getName());
+        if (userVo != null) {
+            t.setCreateuserid(userVo.getId());
+            t.setCreateusername(userVo.getName());
+            t.setModifyuserid(userVo.getId());
+            t.setModifyusername(userVo.getName());
+        }
         t.setDeleted("0");
     }
 

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/JtXmkh.java

@@ -82,6 +82,6 @@ public class JtXmkh extends BaseDo implements Serializable {
     /**
      * 管理单位
      */
-    @TableField(value = "SYNCSTATE")
+    @TableField(value = "GLDW")
     private String gldw;
 }

jsglkh-entity/src/main/java/com/rongwei/bsentity/domain/JtYcpfhz.java

@@ -71,6 +71,9 @@ public class JtYcpfhz extends BaseDo implements Serializable {
     @TableField(value = "REMARK")
     private String remark;
 
+    @TableField(value = "MAINID")
+    private String mainid;
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
 }

jsglkh-server/src/main/java/com/rongwei/controller/ExamineController.java

@@ -25,7 +25,7 @@ public class ExamineController {
     /**
      * 部门考核
      *
-     * @param khbmId  考核部门表主键
+     * @param khbmId  考核评分总表id
      * @param khzbNum 考核指标编号
      * @return
      */

jsglkh-server/src/main/java/com/rongwei/controller/PredictionScoreController.java

@@ -0,0 +1,34 @@
+package com.rongwei.controller;
+
+import com.rongwei.bscommon.sys.service.impl.PredictionScoreServiceImpl;
+import com.rongwei.rwcommon.base.R;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * PredictionScoreController class
+ *
+ * @author XH
+ * @date 2024/12/14
+ */
+
+@RestController
+@RequestMapping("/prediction-score")
+public class PredictionScoreController {
+    @Autowired
+    private PredictionScoreServiceImpl predictionScoreService;
+
+    /**
+     * 部门考核
+     *
+     * @param khbmId  考核部门表主键
+     * @return
+     */
+    @PostMapping("/generate")
+    public R generateData(@RequestParam(name = "id") String id) {
+        return predictionScoreService.generateData(id);
+    }
+}