feature 代码提交

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

@@ -74,7 +74,7 @@ public class ScoreCalculationServiceNum20 implements ScoreCalculationService {
                 return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
             }
         }
-        boolean b = list.stream().anyMatch(info -> info.getPxfl().equals("0"));
+        boolean b = list.stream().noneMatch(info -> info.getPxfl().equals("0"));
         if (b) {
             finalScore = finalScore.subtract(BigDecimal.ONE);
             errorMsg = errorMsg + "公司级: 不包含培训分类为年度技术交流会的培训计划";

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

@@ -68,7 +68,7 @@ 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()) {
@@ -79,7 +79,7 @@ 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).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;

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

@@ -68,7 +68,7 @@ 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;

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

@@ -67,7 +67,7 @@ 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;