فهرست منبع

fix: 知会-监督扣减分值回显错误问题

lixuesong 2 ماه پیش
والد
کامیت
c8fa110a15

+ 5 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -720,10 +720,11 @@ public class WmPackageManager {
 
     // 监督扣减分值:取上方所选的执行包下,所有监督流程走完的任务,在第一个监督员角色(四个角色)下监督意见为“监督不通过”的任务分值总和
     // 开发理解的取值逻辑:取监督结果为不通过,监察状态为CKT2(待人用疫苗事业部总经理审核),且不可修改的数据对应的任务分值总和,即为监督扣减分值
-    List<WmTaskSupervision> taskSupervisions = taskSupervisionMapper.selectList(Wrappers
-        .<WmTaskSupervision>lambdaQuery().eq(WmTaskSupervision::getPackageId, packageId)
-        .eq(WmTaskSupervision::getSupervisionResult, Boolean.FALSE).eq(WmTaskSupervision::getModifiable, Boolean.FALSE)
-        .eq(WmTaskSupervision::getSupervisionState, UpmsState.TaskSupervisionState.CKT2));
+    List<WmTaskSupervision> taskSupervisions =
+        taskSupervisionMapper.selectList(Wrappers.<WmTaskSupervision>lambdaQuery()
+            .in(WmTaskSupervision::getPackageId, pkgIds).eq(WmTaskSupervision::getSupervisionResult, Boolean.FALSE)
+            .eq(WmTaskSupervision::getModifiable, Boolean.FALSE).in(WmTaskSupervision::getSupervisionState,
+                UpmsState.TaskSupervisionState.CKT2, UpmsState.TaskSupervisionState.PASSED));
 
     Set<String> supRegTaskIds =
         taskSupervisions.stream().map(task -> String.valueOf(task.getTaskId())).collect(Collectors.toSet());