dengjia 3 місяців тому
батько
коміт
e455923292

+ 12 - 13
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmPackageManager.java

@@ -668,6 +668,18 @@ public class WmPackageManager {
     Map<String, List<WmTask>> pkg2TaskListMap =
         tasks.stream().collect(Collectors.groupingBy(WmTask::getScorePackageId));
 
+    Set<Integer> collect =
+        checkChainNodeCheckHistoryService
+            .list(
+                Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery()
+                    .eq(
+                        SysCheckChainNodeCheckHistory::getCheckResult,
+                        Boolean.TRUE)
+                    .eq(SysCheckChainNodeCheckHistory::getNodeId, 6))
+            .stream()
+            .map(SysCheckChainNodeCheckHistory::getTargetId)
+            .collect(Collectors.toSet());
+
     List<WmScorePackageInfoExcelModel> result =
         pkgs.parallelStream()
             .map(
@@ -1028,19 +1040,6 @@ public class WmPackageManager {
                               .sorted()
                               .collect(Collectors.toList());
 
-                      Set<Integer> collect =
-                          checkChainNodeCheckHistoryService
-                              .list(
-                                  Wrappers.<SysCheckChainNodeCheckHistory>lambdaQuery()
-                                      .in(SysCheckChainNodeCheckHistory::getTargetId, tIds)
-                                      .eq(
-                                          SysCheckChainNodeCheckHistory::getCheckResult,
-                                          Boolean.TRUE)
-                                      .eq(SysCheckChainNodeCheckHistory::getNodeId, 6))
-                              .stream()
-                              .map(SysCheckChainNodeCheckHistory::getTargetId)
-                              .collect(Collectors.toSet());
-
                       if (CollUtil.isEmpty(collect)) {
                         continue;
                       }