Browse Source

Merge remote-tracking branch 'origin/FixCnbg-data-20250302' into cnbg-master

dengjia 4 months ago
parent
commit
38e35a5732

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

@@ -1204,7 +1204,7 @@ public class WmPackageManager {
       Map<String, List<Map<String, Object>>> pkg2CheckListMap =
           checkBatch.stream().collect(Collectors.groupingBy((row) -> row.get("pkg_id").toString()));
 
-      pkgBatch.parallelStream()
+      List<WmScorePackageCheckStatusExcelModel> resultBatch = pkgBatch.parallelStream()
           .map(
               pkg -> {
                 WmScorePackageCheckStatusExcelModel model =
@@ -1363,10 +1363,8 @@ public class WmPackageManager {
                         todos[2] + todos[3] + todos[8] + todos[9] + todos[5] + todos[6]));
                 return model;
               })
-          .forEach(
-              model -> {
-                result.add(model);
-              });
+          .collect(Collectors.toList());
+      result.addAll(resultBatch);
     }
 
     return result;