检查任务

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

@@ -232,7 +232,6 @@ public class SafetyCheckJobBusiness {
             roles = planToRoleMapper.selectList(ros);
         }
 
-
         List<SysOrg> execOrgs = null;
         if (ObjectUtil.isEmpty(execOrg)) {
             //如果没有选择具体执行检查的机构，则根据执行机构类型查询
@@ -278,18 +277,28 @@ public class SafetyCheckJobBusiness {
 
         PlanTaskBuildVo vo = null;
         for (SysOrg org : execOrgList) {
-            for (CoreSafecheckPlanToRole role : roles) {
-                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);
-            }
+            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);
+//            for (CoreSafecheckPlanToRole role : roles) {
+//                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);
+//            }
         }
 
         return list;
@@ -351,7 +360,7 @@ public class SafetyCheckJobBusiness {
             checkTask.setPlanEndTime(end);
             checkTask.setStartTime(null);
             checkTask.setEndTime(null);
-            checkTask.setRoleId(taskPlan.getRole().getRoleId());
+//            checkTask.setRoleId(taskPlan.getRole().getRoleId());
             checkTask.setIsQuestion(0L);
             checkTask.setSourceType(Long.valueOf(sourceType));
 //            checkTask.setId(UUID.randomUUID().toString().replace("-", ""));