fix: 提交任务汇总

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

@@ -509,7 +509,7 @@ public class WmPackageManager {
                 childrenPkgs.stream().collect(Collectors.groupingBy(WmScorePackage::getRelationScoreId, Collectors.mapping(WmScorePackage::getId, Collectors.toList())));
 
         // 获取全部的任务
-        List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, cPkgIds).ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED));
+        List<WmTask> tasks = taskService.list(Wrappers.<WmTask>lambdaQuery().in(WmTask::getScorePackageId, cPkgIds)/*.ne(WmTask::getTaskStatus, UpmsState.TaskState.REJECTED)*/);
 
         // 根据任务类型id分组
         Map<String, List<WmTask>> pkg2TaskListMap = tasks.stream().collect(Collectors.groupingBy(WmTask::getScorePackageId));
@@ -519,7 +519,7 @@ public class WmPackageManager {
         Map<Integer, List<WmPackageTaskTypeQty>> pttMap = taskTypeQties.stream().collect(Collectors.groupingBy(WmPackageTaskTypeQty::getPackageId));
 
 
-        List<WmScorePackageInfoExcelModel> result = pkgs.stream().map(pkg -> {
+        List<WmScorePackageInfoExcelModel> result = pkgs.parallelStream().map(pkg -> {
 
             // 基础信息
             WmScorePackageInfoExcelModel model = new WmScorePackageInfoExcelModel();
@@ -542,80 +542,113 @@ public class WmPackageManager {
             SysDept s = service.get(Integer.parseInt(pkg.getDeptId()));
             model.setServiceName(s.getName());
 
-            // 任务数据统计
-            List<WmTask> list = pkg2TaskListMap.get(pkg.getId());
-            if (CollUtil.isNotEmpty(list)) {
-                Map<String, List<WmTask>> tt2TaskMap = list.stream().collect(Collectors.groupingBy(WmTask::getTaskTypeId));
-
-                List<WmTask> tt53 = tt2TaskMap.get("53");
+            List<String> cPkgIdList = parentId2PkgMap.get(pkg.getId());
 
-                model.setTt53Submit(CollUtil.isNotEmpty(tt53) ? String.valueOf(tt53.size()) : "0");
-                model.setTt53checked("0");
+            // 任务数据统计
+            if (CollUtil.isNotEmpty(cPkgIdList)) {
 
-                List<WmTask> tt52 = tt2TaskMap.get("52");
 
-                model.setTt52submit(CollUtil.isNotEmpty(tt52) ? String.valueOf(tt52.size()) : "0");
-                model.setTt52checked("0");
+                int tt53Submit = 0;
+                int tt52submit = 0;
+                int tt51submit = 0;
+                int tt14submit = 0;
+                int tt17submit = 0;
+                int tt12submit = 0;
+                int tt13submit = 0;
+                int tt1submit = 0;
+                int tt5submit = 0;
+                int tt3submit = 0;
+                int tt4submit = 0;
+                int tt64submit = 0;
+                int tt19submit = 0;
 
-                List<WmTask> tt51 = tt2TaskMap.get("51");
 
-                model.setTt51submit(CollUtil.isNotEmpty(tt51) ? String.valueOf(tt51.size()) : "0");
-                // model.setTt51checked("0");
+                for (String cPkgId : cPkgIdList) {
 
-                List<WmTask> tt14 = tt2TaskMap.get("14");
+                    List<WmTask> list = pkg2TaskListMap.get(cPkgId);
 
-                model.setTt14submit(CollUtil.isNotEmpty(tt14) ? String.valueOf(tt14.size()) : "0");
-                // model.setTt14checked();
+                    if (CollUtil.isNotEmpty(list)) {
+                        continue;
+                    }
 
-                List<WmTask> tt17 = tt2TaskMap.get("17");
+                    for (WmTask task : list) {
+                        String taskTypeId = task.getTaskTypeId();
 
-                model.setTt17submit(CollUtil.isNotEmpty(tt17) ? String.valueOf(tt17.size()) : "0");
-                // model.setTt17checked();
+                        if (StrUtil.equals(taskTypeId, "53")) {
+                            tt53Submit++;
+                        }
 
-                List<WmTask> tt12 = tt2TaskMap.get("12");
+                        if (StrUtil.equals(taskTypeId, "52")) {
+                            tt52submit++;
+                        }
 
-                model.setTt12submit(CollUtil.isNotEmpty(tt12) ? String.valueOf(tt12.size()) : "0");
-                // model.setTt12Checked();
+                        if (StrUtil.equals(taskTypeId, "51")) {
+                            tt51submit++;
+                        }
 
-                List<WmTask> tt13 = tt2TaskMap.get("13");
+                        if (StrUtil.equals(taskTypeId, "14")) {
+                            tt14submit++;
+                        }
 
-                model.setTt13submit(CollUtil.isNotEmpty(tt13) ? String.valueOf(tt13.size()) : "0");
-                // model.setTt13check();
+                        if (StrUtil.equals(taskTypeId, "17")) {
+                            tt17submit++;
+                        }
 
-                List<WmTask> tt1 = tt2TaskMap.get("1");
+                        if (StrUtil.equals(taskTypeId, "12")) {
+                            tt12submit++;
+                        }
 
-                model.setTt1submit(CollUtil.isNotEmpty(tt1) ? String.valueOf(tt1.size()) : "0");
-                // model.setTt1checked();
+                        if (StrUtil.equals(taskTypeId, "13")) {
+                            tt13submit++;
+                        }
 
-                List<WmTask> tt5 = tt2TaskMap.get("5");
+                        if (StrUtil.equals(taskTypeId, "1")) {
+                            tt1submit++;
+                        }
 
-                model.setTt5submit(CollUtil.isNotEmpty(tt5) ? String.valueOf(tt5.size()) : "0");
-                // model.setTt5checked();
+                        if (StrUtil.equals(taskTypeId, "5")) {
+                            tt5submit++;
+                        }
 
-                List<WmTask> tt3 = tt2TaskMap.get("3");
+                        if (StrUtil.equals(taskTypeId, "3")) {
+                            tt3submit++;
+                        }
 
-                model.setTt3submit(CollUtil.isNotEmpty(tt3) ? String.valueOf(tt3.size()) : "0");
-                // model.setTt3check();
+                        if (StrUtil.equals(taskTypeId, "4")) {
+                            tt4submit++;
+                        }
 
-                List<WmTask> tt4 = tt2TaskMap.get("4");
+                        if (StrUtil.equals(taskTypeId, "64")) {
+                            tt64submit++;
+                        }
 
-                model.setTt4submit(CollUtil.isNotEmpty(tt4) ? String.valueOf(tt4.size()) : "0");
-                // model.setTt4checked();
+                        if (StrUtil.equals(taskTypeId, "19")) {
+                            tt19submit++;
+                        }
+                    }
 
-                List<WmTask> tt64 = tt2TaskMap.get("64");
+                }
 
-                model.setTt64submit(CollUtil.isNotEmpty(tt64) ? String.valueOf(tt64.size()) : "0");
-                // model.setTt64checked();
+                model.setTt53Submit(String.valueOf(tt53Submit));
+                model.setTt52submit(String.valueOf(tt52submit));
+                model.setTt51submit(String.valueOf(tt51submit));
+                model.setTt14submit(String.valueOf(tt14submit));
+                model.setTt17submit(String.valueOf(tt17submit));
+                model.setTt12submit(String.valueOf(tt12submit));
+                model.setTt13submit(String.valueOf(tt13submit));
+                model.setTt1submit(String.valueOf(tt1submit));
+                model.setTt5submit(String.valueOf(tt5submit));
+                model.setTt3submit(String.valueOf(tt3submit));
+                model.setTt4submit(String.valueOf(tt4submit));
+                model.setTt64submit(String.valueOf(tt64submit));
+                model.setTt19submit(String.valueOf(tt19submit));
 
-                List<WmTask> tt19 = tt2TaskMap.get("19");
 
-                model.setTt19submit(CollUtil.isNotEmpty(tt19) ? String.valueOf(tt19.size()) : "0");
-                // model.setTt19checked();
             }
 
 
             // 下发任务统计
-            List<String> cPkgIdList = parentId2PkgMap.get(pkg.getId());
+
             if (CollUtil.isNotEmpty(cPkgIdList)) {
 
                 int tt53dist = 0;