feat: node 6 cond

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

@@ -1607,13 +1607,27 @@ public class WmSupervisionManager {
             .sorted()
             .collect(Collectors.toList());
 
+    // 获取子集包中的所有任务
+    List<WmTask> tasks =
+        taskService.listAvailableTaskForSupervision1(
+            pkgIds,
+            Collections.emptyList());
+
+    if (CollUtil.isEmpty(tasks)) {
+      return page;
+    }
+
+    List<Integer> tids = tasks.stream().mapToInt(t -> Integer.parseInt(t.getId())).boxed()
+        .distinct().sorted().collect(Collectors.toList());
+
     // 积分包内已经监督的任务
     List<WmTaskSupervision> list1 =
         taskSupervisionService.list(
             Wrappers.<WmTaskSupervision>lambdaQuery()
+                .in(WmTaskSupervision::getTaskId, tids)
                 //                 .in(WmTaskSupervision::getRoleId, visibleRoleIds)
                 // .eq(WmTaskSupervision::getModifiable, false)
-                .in(WmTaskSupervision::getPackageId, pkgIds)
+//                .in(WmTaskSupervision::getPackageId, pkgIds)
                 .orderByDesc(WmTaskSupervision::getCreateTime));
 
     List<WmTaskSupervision> list =
@@ -1631,6 +1645,10 @@ public class WmSupervisionManager {
                 })
             .collect(Collectors.toList());
 
+    if (CollUtil.isEmpty(list)) {
+      return page;
+    }
+
     // 监督员
     Boolean review = query.getReview();
 
@@ -2080,9 +2098,21 @@ public class WmSupervisionManager {
             .collect(Collectors.toMap(WmTaskType::getId, WmTaskType::getTaskTypeName));
 
     // 获取包下的所有任务
+//    List<WmTask> tasks =
+//        taskService.list(
+//            Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, pkgMap.keySet()));
+
+    // 获取子集包中的所有任务
     List<WmTask> tasks =
-        taskService.list(
-            Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, pkgMap.keySet()));
+        taskService.listAvailableTaskForSupervision1(
+            pkgMap.keySet().stream()
+                .mapToInt(Integer::valueOf)
+                .boxed()
+                .distinct()
+                .sorted()
+                .collect(Collectors.toList()),
+            Collections.emptyList());
+
     Map<String, WmTask> tid2EntityMap =
         tasks.stream().collect(Collectors.toMap(WmTask::getId, Function.identity()));