feature 代码提交

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

@@ -46,7 +46,7 @@ public class ScoreCalculationServiceNum1 implements ScoreCalculationService {
         // 默认得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+         String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getJschfjglzd())) {
             finalScore = finalScore.subtract(THREE_SOURCE);
             errorMsg = "公司级:技术策划分级分类管理制度为空";
@@ -74,7 +74,7 @@ public class ScoreCalculationServiceNum1 implements ScoreCalculationService {
                 .collect(Collectors.toList());
         if (projectNameList.isEmpty()) {
             finalScore = THREE_SOURCE;
-            errorMsg = "项目级:分级分类制定明确";
+            errorMsg = "";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         finalScore = finalScore.subtract(ZERO_POINT_FIVE_SOURCE.multiply(BigDecimal.valueOf(projectNameList.size())));

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

@@ -46,7 +46,7 @@ public class ScoreCalculationServiceNum10 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 获取考核项目信息 计划开始时间”在考核区间内且中标主体为二级单位以上的项目
         if (StringUtils.isBlank(jtGsjtbsj.getGlhgxlcfjflzd())) {
             errorMsg = "公司级：流程分级分类制度为空";

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

@@ -47,7 +47,7 @@ public class ScoreCalculationServiceNum11 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 问题清单为空，扣2分。
         if (StringUtils.isBlank(jtGsjtbsj.getWtbhglwtqd())) {
             errorMsg = "公司级：问题清单为空";

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

@@ -47,7 +47,7 @@ public class ScoreCalculationServiceNum12 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 问题清单为空，扣2分。
         if (StringUtils.isBlank(jtGsjtbsj.getScbhglwbscyjqd())) {
             errorMsg = "公司级：外部审查意见清单为空";

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

@@ -61,7 +61,7 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 获取考核项目信息 计划完成时间”在考核区间内且中标主体为二级单位以上的项目
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")
@@ -116,7 +116,7 @@ public class ScoreCalculationServiceNum13 implements ScoreCalculationService {
         if (rate.compareTo(BigDecimal.valueOf(100)) >= 0) {
             // 不扣分
         } else if (rate.compareTo(BigDecimal.valueOf(60)) <= 0) {
-            finalScore = BigDecimal.ZERO.subtract(THREE_SOURCE);
+            finalScore = BigDecimal.ZERO;
         } else {
             finalScore = finalScore.subtract(CALCULATE_Y3(BigDecimal.valueOf(100), BigDecimal.valueOf(3), BigDecimal.valueOf(60), BigDecimal.ZERO, rate));
         }

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

@@ -45,7 +45,7 @@ public class ScoreCalculationServiceNum14 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getEpcfaschgxfjglzdfrztzr())) {
             errorMsg = "公司级：分级管理制度/法人主体责任字段为空";
             finalScore = finalScore.subtract(TWO_SOURCE);

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

@@ -58,7 +58,7 @@ public class ScoreCalculationServiceNum15 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 考核范围：“计划开始时间”在考核区间内且中标主体为二级单位以上的项目。
         List<JtFjglxm> jtFjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")

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

@@ -56,7 +56,7 @@ public class ScoreCalculationServiceNum16 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 考核范围：“计划开始时间”在考核区间内且中标主体为二级单位以上的项目
         List<JtFjglxm> jtFjglxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>().eq(BaseDo::getDeleted, "0")
                 .eq(JtFjglxm::getZbztdj, "0")

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

@@ -63,7 +63,7 @@ public class ScoreCalculationServiceNum17 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getSjjdkzzm())) {
             errorMsg = "公司级：设计交底开展证明文件为空";
             finalScore = finalScore.subtract(TWO_SOURCE);

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

@@ -46,7 +46,7 @@ public class ScoreCalculationServiceNum18 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getBgglzd())) {
             errorMsg = "公司级：变更管理制度为空";
             finalScore = finalScore.subtract(FOUR_SOURCE);

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

@@ -45,7 +45,7 @@ public class ScoreCalculationServiceNum19 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         List<JtZbrygwjzrfgqd> list = jtZbrygwjzrfgqdService.list(new LambdaQueryWrapper<JtZbrygwjzrfgqd>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtZbrygwjzrfgqd::getMainid, jtGsjtbsj.getId()));

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

@@ -50,7 +50,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+        String errorMsg = "";
         if (StringUtils.isBlank(jtGsjtbsj.getKcsjmbbxzn())) {
             finalScore = finalScore.subtract(FOUR_SOURCE);
             errorMsg = "公司级:勘察设计模板为空";
@@ -64,7 +64,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
         // 无法获取考核部门直接 记录 信息
         if (khbmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
-            errorMsg = errorMsg + "公司级：无法获取考核部门信息 ";
+            errorMsg = "公司级：无法获取考核部门信息 ";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
 
@@ -74,7 +74,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
                 .in(JtKcsjxm::getMainid, khbmList.stream().map(JtXmkh::getId).collect(Collectors.toList())));
         if (kcsjxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
-            errorMsg = errorMsg + "公司级：无法获取勘察设计项目清单";
+            errorMsg = "公司级：无法获取勘察设计项目清单";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 从项目维度出发 若任务环节编号、任务环节名称、任务环节责任人、环节计划完成时间任一字段为空，扣1分/项。
@@ -86,7 +86,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
                 .collect(Collectors.toList());
         if (!list1.isEmpty()) {
             finalScore = finalScore.subtract(BigDecimal.valueOf(list1.size()));
-            errorMsg = errorMsg + "项目级:" + String.format(ERRORMSG, String.join(",", list1));
+            errorMsg =  String.format(ERRORMSG, String.join(",", list1));
             if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
                 finalScore = BigDecimal.ZERO;
                 return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
@@ -102,7 +102,7 @@ public class ScoreCalculationServiceNum2 implements ScoreCalculationService {
 
         if (!list2.isEmpty()) {
             finalScore = finalScore.subtract(BigDecimal.valueOf(list2.size()));
-            errorMsg = errorMsg + "项目级:" + String.format(ERRORMSG_SECOND, String.join(",", list2));
+            errorMsg = "项目级:" + String.format(ERRORMSG_SECOND, String.join(",", list2));
             if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
                 finalScore = BigDecimal.ZERO;
                 return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);

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

@@ -53,7 +53,7 @@ public class ScoreCalculationServiceNum20 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         List<JtPxjhqd> list = Collections.unmodifiableList(jtPxjhqdService.list(new LambdaQueryWrapper<JtPxjhqd>()
                 .eq(BaseDo::getDeleted, "0")
                 .eq(JtPxjhqd::getMainid, jtGsjtbsj.getId())));

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

@@ -36,7 +36,7 @@ public class ScoreCalculationServiceNum38 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = BigDecimal.ZERO;
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getZgcsrmwjhtwj())) {
             finalScore = finalScore.subtract(TWO_SOURCE);
             errorMsg = "公司级:未设置总工程师岗位或总工程师未进领导班子";

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

@@ -36,7 +36,7 @@ public class ScoreCalculationServiceNum3Deprecated implements ScoreCalculationSe
         // 考核得分
         BigDecimal finalScore = BigDecimal.ZERO;
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getGzdgzdsmbbxzn())) {
             finalScore = finalScore.subtract(THREE_SOURCE);
             errorMsg = "公司级:工作大纲/指导书模板（编写指南）为空";

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

@@ -52,7 +52,7 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+        String errorMsg = "";
         if (StringUtils.isBlank(jtGsjtbsj.getGzdgzdsmbbxzn())) {
             finalScore = finalScore.subtract(THREE_SOURCE);
             errorMsg = "公司级:工作大纲/指导书模板（编写指南）为空";
@@ -71,7 +71,7 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
                 .between(JtFjglxm::getJhkssj, jtGsjtbsj.getAssessmentstarttime(), jtGsjtbsj.getAssessmentendtime()));
         if (khxmList.isEmpty()) {
             finalScore = BigDecimal.ZERO;
-            errorMsg = errorMsg + "无法获取到项目信息";
+            errorMsg = errorMsg + "无法获取到项目信息 ";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
         // 获取勘察工作大纲
@@ -81,7 +81,7 @@ public class ScoreCalculationServiceNum4 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);
         }
         // 获取已审定的项目数量
@@ -125,7 +125,7 @@ public class ScoreCalculationServiceNum4 implements ScoreCalculationService {
         List<String> emergingProjects = getEmergingProjects(khxmList, xmmcList, emptyBlankData.size());
         if (!emergingProjects.isEmpty()) {
             String peojectNames = String.join(",", emergingProjects);
-            errorMsg = errorMsg + "项目级：以下项目名称：" + peojectNames + " 属于新兴业务项目但未开展设勘察设计指导书审查";
+            errorMsg = errorMsg + "项目级：以下项目名称：" + peojectNames + " 属于新兴业务项目但未开展设勘察设计指导书审查 ";
             finalScore = finalScore.subtract(BigDecimal.valueOf((double) emergingProjects.size() * 0.5));
             if (finalScore.compareTo(BigDecimal.ZERO) <= 0) {
                 finalScore = BigDecimal.ZERO;

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

@@ -52,7 +52,7 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+         String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getGzdgzdsmbbxzn())) {
             finalScore = finalScore.subtract(THREE_SOURCE);
             errorMsg = "公司级:工作大纲/指导书模板（编写指南）为空";
@@ -88,7 +88,7 @@ public class ScoreCalculationServiceNum5 implements ScoreCalculationService {
                 .filter(data -> StringUtils.isNotBlank(data.getSdzrr()) && data.getSdsj() != null)
                 .collect(Collectors.toList());
         BigDecimal approvalRate = calculateApprovalRate(khxmList, authorizeDatas);
-        errorMsg = errorMsg +"公司级：审查审定率为：" + approvalRate + "%";
+        errorMsg = errorMsg +"公司级：审查审定率为：" + approvalRate + "% ";
         if (approvalRate.compareTo(BigDecimal.valueOf(90)) >= 0) {
 //            return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         } else if (approvalRate.compareTo(BigDecimal.valueOf(60)) <= 0) {

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

@@ -43,7 +43,7 @@ public class ScoreCalculationServiceNum6 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore =  jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getZtfapslcfjflzd())) {
             finalScore = finalScore.subtract(FOUR_SOURCE);
             errorMsg = "公司级:流程分级分类制度为空";

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

@@ -47,7 +47,7 @@ public class ScoreCalculationServiceNum7 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
 
         // 总体方案评审清单
         List<JtWyys> ztfapsList = jtWyysService.list(new LambdaQueryWrapper<JtWyys>()

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

@@ -45,7 +45,7 @@ public class ScoreCalculationServiceNum8 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         if (StringUtils.isBlank(jtGsjtbsj.getYjbhglyjqd())) {
             errorMsg = "公司级：意见清单为空";
             finalScore = finalScore.subtract(THREE_SOURCE);

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

@@ -60,7 +60,7 @@ public class ScoreCalculationServiceNum9 implements ScoreCalculationService {
         // 考核得分
         BigDecimal finalScore = jkAssessmentRules.getWeight();
         // 扣分细则
-        String errorMsg = null;
+          String errorMsg="";
         // 获取考核项目信息 计划开始时间”在考核区间内且中标主体为二级单位以上的项目
         List<JtFjglxm> khxmList = jtFjglxmService.list(new LambdaQueryWrapper<JtFjglxm>()
                 .eq(BaseDo::getDeleted, "0")