feature 代码提交

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

@@ -139,9 +139,10 @@ public class ExamineServiceImpl implements ExamineService {
             jtYcpfhzDetailService.removeByIds(removeIds);
         }
         // 重新计算得分
-        double sum = oldData.stream().filter(info -> !removeIds.contains(info.getId())).mapToDouble(info -> info.getYcpf().intValue()).sum();
-        double sum1 = saveData.stream().mapToDouble(info -> info.getYcpf().intValue()).sum();
-        jtYcpfhz.setZpf(BigDecimal.valueOf(sum1).add(BigDecimal.valueOf(sum)));
+        BigDecimal sum = oldData.stream().filter(info -> !removeIds.contains(info.getId())).map(JtYcpfhzDetail::getYcpf)
+                .reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+        BigDecimal sum1 = saveData.stream().map(JtYcpfhzDetail::getYcpf).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
+        jtYcpfhz.setZpf(sum.add(sum1));
         jtYcpfhzService.updateById(jtYcpfhz);
         jtYcpfhzDetailService.saveBatch(saveData, 10);
         return R.ok();

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

@@ -69,7 +69,6 @@ public class ScoreCalculationServiceNum11 implements ScoreCalculationService {
                 .distinct()
                 .collect(Collectors.toList());
         if (projectNames.isEmpty()) {
-            errorMsg = "项目级：不存在不合规项目";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
 

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

@@ -69,7 +69,6 @@ public class ScoreCalculationServiceNum12 implements ScoreCalculationService {
                 .distinct()
                 .collect(Collectors.toList());
         if (projectNames.isEmpty()) {
-            errorMsg = "项目级：不存在不合规项目";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
 

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

@@ -64,8 +64,7 @@ public class ScoreCalculationServiceNum15 implements ScoreCalculationService {
                 .eq(JtFjglxm::getZbztdj, "0")
                 .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
                 .eq(JtFjglxm::getSfsjsggl, "0")
-                .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(),
-                        jtGsjtbsj.getAssessmentendtime()));
+                .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(),  jtGsjtbsj.getAssessmentendtime()));
         // EPC项目数量：项目清单中，是否涉及施工管理为是且在勘察设计项目工作清单的项目数量。
         if(jtFjglxmList.isEmpty()){
             errorMsg="项目级：无法获取到分级管理项目清单";

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

@@ -109,7 +109,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
      */
     public JtYcpfhzDetail calculateFinalSource(BigDecimal finalScore, BigDecimal rate, JtYcpfhz jtYcpfhz, JkAssessmentRules jkAssessmentRules,
                                                SysUserVo currentUser) {
-        String errorMsg = "审查审定率为：" + rate.toString() + "%";
+        String errorMsg = "覆盖率为：" + rate.toString() + "%";
         if (rate.compareTo(BigDecimal.valueOf(100)) >= 0) {
             // 不扣分
         } else if (rate.compareTo(BigDecimal.valueOf(60)) <= 0) {
@@ -144,7 +144,8 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
         //该模块的数据量
         long allNameCount = jtSjjdqdList.stream().map(JtSjjdqd::getXmmc).distinct().count();
         long count = jtSjjdqdList.stream().filter(data -> data.getJhjdsj() != null &&
-                        compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj())).map(JtSjjdqd::getXmmc)
+                        compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj()))
+                .map(JtSjjdqd::getXmmc)
                 .distinct()
                 .count();
         return (int) (allNameCount - count);
@@ -158,7 +159,8 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
     public int calculateDenominator(List<JtFjglxm> jtFjglxmList, List<JtSjjdqd> jtSjjdqdList, JtGsjtbsj jtGsjtbsj) {
         long count = jtFjglxmList.stream().map(JtFjglxm::getXmmc).distinct().count();
         long count1 = jtSjjdqdList.stream().filter(data -> data.getJhjdsj() != null &&
-                        !compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj())).map(JtSjjdqd::getXmmc)
+                        !compareDatesIgnoringTime(jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime(), data.getJhjdsj()))
+                .map(JtSjjdqd::getXmmc)
                 .distinct()
                 .count();
         return (int) (count - count1);

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

@@ -56,7 +56,7 @@ public class ScoreCalculationServiceNum18 implements ScoreCalculationService {
                 .eq(BaseDo::getDeleted, "0")
                 .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))
+                        (StringUtils.isBlank(data.getBgfzr()) || data.getBgpzsj() == null))
                 .map(JtSjbgqd::getXmmc).distinct().collect(Collectors.toList());
         if (!projectName.isEmpty()) {
             errorMsg = "项目级:以下项目名称" + String.join(",", projectName) + "变更提出人、变更提出时间不为空，但变更负责人、变更批准时间为空";

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

@@ -59,7 +59,7 @@ public class ScoreCalculationServiceNum19 implements ScoreCalculationService {
                 .map(JtZbrygwjzrfgqd::getGlryxm)
                 .collect(Collectors.toList());
         if (collect.isEmpty()) {
-            errorMsg = "公司级：暂无人员缺失管理人员岗位职责";
+            errorMsg = "";
         } else {
             errorMsg = "公司级：以下管理人员" + String.join(",", collect) + "岗位职责为空";
             if (collect.size() >= 4) {

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

@@ -68,7 +68,8 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
                 .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
-                .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
+           //.between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime())
+        );
 
         if (khxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
@@ -82,7 +83,7 @@ public class ScoreCalculationServiceNum3 implements ScoreCalculationService {
                 .in(JtGzdg::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (gzdgList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
-            errorMsg = errorMsg + "无法获取到勘察工作大纲";
+            errorMsg = errorMsg + "项目级: 无法获取到勘察工作大纲";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 获取已审定的项目数量

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

@@ -68,7 +68,8 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
                 .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
-                .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
+                //.between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime())
+        );
         if (khxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
             errorMsg = errorMsg + "无法获取到项目信息 ";
@@ -77,11 +78,11 @@ 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).collect(Collectors.toList()))
+                // .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 + "无法获取到勘察工作大纲 ";
+            errorMsg = errorMsg + "项目级: 无法获取到勘察工作大纲 ";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 获取已审定的项目数量

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

@@ -67,7 +67,8 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
                 .in(JtFjglxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList()))
-                .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
+                //.between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime())
+        );
         if (khxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
             errorMsg = errorMsg + "无法获取到项目信息";
@@ -76,11 +77,11 @@ 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).collect(Collectors.toList()))
+                //.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 + "无法获取到勘察工作大纲";
+            errorMsg = errorMsg + "项目级: 无法获取到勘察工作大纲";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 获取已审定的项目数量