Explorar o código

处理安全检查任务生成时的bug

jingyuanchao hai 1 ano
pai
achega
642cc677f0

+ 5 - 13
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/job/SafetyCheckJobBusiness.java

@@ -211,6 +211,9 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
                     tasks.addAll(planTask);
                 }
 
+                String collect = tasks.stream().map(t -> t.getExecOrg().getId()).distinct().map(String::valueOf).collect(Collectors.joining(","));
+                System.out.println("("+collect+")");
+                System.out.println("("+collect.split(",").length+")");
 
                 //生成具体任务
                 buildTask(datetime, tasks, dateRange.getStartTime(), dateRange.getEndTime(), true, 0);
@@ -418,17 +421,6 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
         PlanTaskBuildVo vo = null;
         for (SysOrg org : execOrgList) {
 
-
-//            vo = new PlanTaskBuildVo();
-//            vo.setPlanId(plan.getId());
-//            vo.setEndTime(plan.getEndDate());
-//            vo.setStartTime(plan.getStartDate());
-//            vo.setCheckOrg(check);
-//            vo.setExecOrg(org);
-//            vo.setPlanName(plan.getPlanName());
-//            vo.setRole(role);
-//            vo.setPlanCycle(Math.toIntExact(plan.getPlanCycle()));
-//            list.add(vo);
             //履职和安全检查存在周期字典差别,除了无周期都是+2
             int cycleCode = 0;
             if (plan.getPlanCycle() != 6) {
@@ -591,11 +583,11 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
                 checkTaskService.remove(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getOrgId, checkTask.getOrgId()).eq(CoreSafetyTask::getYmdDate, checkTask.getYmdDate()).in(CoreSafetyTask::getStatus, 1, 2).eq(CoreSafetyTask::getPlanId, checkTask.getPlanId()));
                 ats.add(checkTask);
             }
-
+/*
             if (ats.size() == 200) {
                 checkTaskService.saveBatch(ats);
                 ats = new ArrayList<>();
-            }
+            }*/
         }
 
         if (ats.size() > 0) {