调整安全检查编辑逻辑

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

@@ -175,10 +175,11 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+            DateRange dateRange = new DateRange(plans.get(0).getStartDate(),plans.get(0).getEndDate());
             if(plans.get(0).getPlanCycle()!=6L){
                 code=CycleCommonEnum.getEnum( Math.toIntExact(plans.get(0).getPlanCycle())+2);
+                dateRange = DateUtils.getStartAndEnd(new Date(), code);
             }
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
             List<PlanTaskBuildVo> tasks = new ArrayList<>();
             for (CoreSafecheckPlan plan : plans) {
                 List<PlanTaskBuildVo> planTask = createPlanTask(plan);
@@ -380,11 +381,11 @@ public class SafetyCheckJobBusiness extends TaskCreatingServiceImplBase<CoreSafe
             DateTime datetime = new DateTime();
             datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
             CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+            DateRange dateRange = new DateRange(plan.getStartDate(),plan.getEndDate());
             if(plan.getPlanCycle()!=6L){
                 code=CycleCommonEnum.getEnum( Math.toIntExact(plan.getPlanCycle())+2);
+                dateRange = DateUtils.getStartAndEnd(new Date(), code);
             }
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
-
             //获取当前受检机构当前周期营业中的作息
             List<SysWorkTime> workTimes = getWorkTime(dateRange.getStartTime(), dateRange.getEndTime(), org.getId());
             //配合履职次数为short类型

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/service/impl/CoreSafecheckPlanServiceImpl.java

@@ -205,12 +205,12 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             baseMapper.updateById(ap);
 
             CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+            DateRange dateRange = new DateRange(ap.getStartDate(),ap.getEndDate());
             if(plan.getPlanCycle()!=6L){
                 code=CycleCommonEnum.getEnum( Math.toIntExact(plan.getPlanCycle())+2);
+                dateRange = DateUtils.getStartAndEnd(new Date(), code);
             }
             //撤回需要删除本周期所有任务
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
-
 
             if (plan.getPlanCycle() == 6L) {
                 coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, ap.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
@@ -224,11 +224,11 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
         baseMapper.updateById(plan);
 
         CycleCommonEnum code = CycleCommonEnum.getEnum(0);
+        DateRange dateRange = new DateRange(plan.getStartDate(),plan.getEndDate());
         if(plan.getPlanCycle()!=6L){
             code=CycleCommonEnum.getEnum( Math.toIntExact(plan.getPlanCycle())+2);
+            dateRange = DateUtils.getStartAndEnd(new Date(), code);
         }
-        //撤回需要删除本周期所有任务
-        DateRange dateRange = DateUtils.getStartAndEnd(new Date(), code);
         if (plan.getPlanCycle() == 6L) {
             coreSafetyTaskMapper.delete(new LambdaQueryWrapper<CoreSafetyTask>().eq(CoreSafetyTask::getPlanId, plan.getId()).between(CoreSafetyTask::getYmdDate, dateRange.getStartTime(), dateRange.getEndTime()));
         } else {