Bladeren bron

培训/演练 生成任务作息判断bug处理

jingyuanchao 1 jaar geleden
bovenliggende
commit
8c480b4dfe

+ 0 - 4
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillTaskServiceImpl.java

@@ -384,10 +384,6 @@ public class CoreDrillTaskServiceImpl extends ServiceImpl<CoreDrillTaskMapper, C
         }
         final List<SysOrg> orgList = getExecOrgList(plan.getPlanExecOrgList(), plan.getExecOrgType(), plan.getBelongOrgPath());
         final List<SysWorkTime> workTimeList = getWorkTimeList(orgList, start, end);
-        if (workTimeList.isEmpty()) {
-            log.error("生成任务时,需要生成任务的机构均未营业,本次任务跳过!");
-            return;
-        }
         //List<SysOrg> execOrgList = getExecOrgList(plan, start, end);
         saveTaskAndRoleData(plan, start, end, orgList, workTimeList);
     }

+ 1 - 5
soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingTaskServiceImpl.java

@@ -422,10 +422,6 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
         }
         final List<SysOrg> orgList = getExecOrgList(plan.getPlanExecOrgList(), plan.getExecOrgType(), plan.getBelongOrgPath());
         final List<SysWorkTime> workTimeList = getWorkTimeList(orgList, start, end);
-        if (workTimeList.isEmpty()) {
-            log.error("生成任务时,需要生成任务的机构均未营业,本次任务跳过!");
-            return;
-        }
         saveTaskAndRoleData(plan, start, end, orgList, workTimeList);
 
     }
@@ -670,7 +666,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
             planIdList = coreEduTrainingPlanMapper.selectIdByParentId(plan.getId());
             planId = null;
         }
-        if (ObjectUtil.isAllEmpty(planId,planIdList)){
+        if (ObjectUtil.isAllEmpty(planId, planIdList)) {
             return new ArrayList<>();
         }
         request.setStartTime(DateUtil.beginOfMonth(request.getDate()));