Ver código fonte

feature 代码提交

xiahan 7 meses atrás
pai
commit
d327807a8c

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

@@ -85,7 +85,10 @@ 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).collect(Collectors.toList())).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).collect(Collectors.toList()))
+                .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()) {

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

@@ -54,7 +54,10 @@ public class ScoreCalculationServiceNum19 implements ScoreCalculationService {
             errorMsg = "公司级:总部人员岗位及责任分工为空";
             return assemblyYcpfhzDetail(jtYcpfhz, jkAssessmentRules, finalScore, errorMsg, currentUser);
         }
-        List<String> collect = list.stream().filter(info -> StringUtils.isBlank(info.getGlrygwzz())).map(JtZbrygwjzrfgqd::getGlryxm).collect(Collectors.toList());
+        List<String> collect = list.stream()
+                .filter(info -> StringUtils.isBlank(info.getGlrygwzz()))
+                .map(JtZbrygwjzrfgqd::getGlryxm)
+                .collect(Collectors.toList());
         if (collect.isEmpty()) {
             errorMsg = "公司级:暂无人员缺失管理人员岗位职责";
         } else {

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

@@ -62,7 +62,7 @@ public class ScoreCalculationServiceNum22 implements ScoreCalculationService {
 
         List<JtNdjhqd> list = jtNdjhqdService.list(new LambdaQueryWrapper<JtNdjhqd>()
                 .eq(JtNdjhqd::getDeleted, "0")
-                .in(JtNdjhqd::getMainid, jtGsjtbsj.getId()));
+                .eq(JtNdjhqd::getMainid, jtGsjtbsj.getId()));
         //计划完成时间不为空,实际完成时间为空扣1分/项。
         List<String> jhmcList = new LinkedList<>();
         for (JtNdjhqd jtNdjhqd : list) {