计划变更代码提交

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/edu/dto/CoreEduTrainingPlanEditDto.java

@@ -34,8 +34,8 @@ public class CoreEduTrainingPlanEditDto {
     @ApiModelProperty(value = "执行次数")
     private Integer execTimes;
 
-    @ApiModelProperty(value = "计划状态")
-    private int planStatus;
+    /*@ApiModelProperty(value = "计划状态")
+    private Integer planStatus;*/
 
     @ApiModelProperty(value = "是否立即生效", notes = "0:否,1:是")
     private Boolean buildTaskNow = Boolean.FALSE;

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillPlanController.java

@@ -74,7 +74,8 @@ public class CoreDrillPlanController extends BaseController {
     @Log(title = "预案演练计划", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody @Validated CoreDrillPlanUpdateDto coreDrillPlan) {
-        return toAjax(coreDrillPlanService.updateCoreDrillPlan(coreDrillPlan));
+        coreDrillPlanService.updateCoreDrillPlan(coreDrillPlan);
+        return success();
     }
 
     /**

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/ICoreDrillPlanService.java

@@ -51,7 +51,7 @@ public interface ICoreDrillPlanService extends IService<CoreDrillPlan> {
      * @param coreDrillPlan 预案演练计划
      * @return 结果
      */
-    int updateCoreDrillPlan(CoreDrillPlanUpdateDto coreDrillPlan);
+    void updateCoreDrillPlan(CoreDrillPlanUpdateDto coreDrillPlan);
 
     /**
      * 批量删除预案演练计划

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillPlanServiceImpl.java

@@ -22,11 +22,11 @@ import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDataVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanDetailVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanPageVo;
 import com.xunmei.common.core.domain.drill.vo.CoreDrillPlanRoleVo;
+import com.xunmei.common.core.enums.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.drill.DrillPlanStatus;
 import com.xunmei.common.core.enums.edu.EduTrainingPlanStatus;
 import com.xunmei.common.core.exception.SystemException;
-import com.xunmei.common.core.utils.AssertUtil;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.security.utils.SecurityUtils;
@@ -241,59 +241,70 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int updateCoreDrillPlan(CoreDrillPlanUpdateDto request) {
+    public void updateCoreDrillPlan(CoreDrillPlanUpdateDto request) {
         final CoreDrillPlan plan = getById(request.getId());
-        AssertUtil.isNotEmpty(plan, "计划不存在!");
-        //此处判断能否修改,如果可以 需要删除任务,且还需要判断是否需要生成任务
-        Boolean can = checkCanUpdate(request, plan);
-        if (!can) {
-            throw new RuntimeException("当前任务已生成且存在已执行情况,无法修改培训机构类型,具体培训机构,培训角色,培训周期等信息!");
+
+        if (plan.getPlanStatus() == DrillPlanStatus.DRAFT.getCode()) {
+            //草稿状态 可以修改计划
+            doUpdatePlan(plan, request);
+            return;
+        }
+
+        if (plan.getStandard() == 1) {
+            //标准计划
+            updateStandardPlan(plan, request);
+        } else {
+            //标准计划
+            updateCommonPlan(plan, request);
         }
-        //可以修改计划
+
+
+    }
+
+    private void doUpdatePlan(CoreDrillPlan plan, CoreDrillPlanUpdateDto request) {
         BeanUtils.copyProperties(request, plan);
         plan.setUpdateTime(DateUtils.getNowDate());
         plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
         plan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
         coreDrillPlanToRoleMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
+        //List<CoreEduTrainingPlanToRole> trainingPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
         coreDrillPlanToExecOrgMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
         batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
-        List<CoreDrillPlanToRole> coreDrillPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
-        final int i = coreDrillPlanMapper.updateById(plan);
-        if (plan.getStandard() == 1) {
-            //如果标准计划可以修改，那么需要删除所有计划与任务，重新创建计划任务
-            updateStandardPlan(plan, coreDrillPlanToRoleList);
-        } else {
-            //普通计划
-            updateCommonPlan(plan);
-        }
-
-
-        return i;
+        coreDrillPlanMapper.updateById(plan);
     }
 
-    private void updateStandardPlan(CoreDrillPlan plan, List<CoreDrillPlanToRole> drillPlanToRoleList) {
-        //没下发的就不管
-        if (0 == plan.getIssue()) {
-            return;
-        }
-        Long planId = plan.getId();
+    private void updateStandardPlan(CoreDrillPlan plan, CoreDrillPlanUpdateDto request) {
 
-        deletePlanAndTaskByParentPlanId(planId);
-        List<CoreDrillPlan> planList = buildPlanData(plan, drillPlanToRoleList,false);
+        //使用中的标准计划
 
-        if (plan.getPlanStatus() == DrillPlanStatus.DELETED.getCode()) {
-            log.info("计划已被修改为" + DrillPlanStatus.DELETED.getDesc() + "，不再生成任务!");
-            return;
+        Long planId = plan.getId();
+        // 判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
+        Integer standardPlanHasDone = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
+        if (standardPlanHasDone == 1) {
+            //验证修改的字段是否符合要求
+            String errorMsg = "有任务已执行或已过期,仅允许修改培训主题!";
+            validatePlanForStandard(request, plan, errorMsg, 1);
+            doUpdatePlan(plan, request);
+        } else {
+            doUpdatePlan(plan, request);
+            List<CoreDrillPlan> list = lambdaQuery().eq(CoreDrillPlan::getParentId, planId).select(CoreDrillPlan::getId).list();
+            List<Long> collect = list.stream().map(CoreDrillPlan::getId).collect(Collectors.toList());
+            coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(collect, null, null);
+            for (CoreDrillPlan drillPlan : list) {
+                CompletableFuture.runAsync(() -> {
+                    //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
+                    if ((ObjectUtil.equal(EduTrainingPlanStatus.USING.getCode(), plan.getPlanStatus())
+                            && (ObjectUtil.equal(EduTrainingPlanCycleEnum.NONE, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow())))) {
+                        CoreDrillPlanDataVo detailPlanData = getCoreDrillPlanDataVo(drillPlan.getId());
+                        coreDrillTaskService.createTaskForNow(detailPlanData, plan.getPlanStartDate(), plan.getPlanEndDate());
+                    }
+                }, threadPoolTaskExecutor);
+            }
         }
 
+        //TODO 修改任务名称
+        //coreEduTrainingTaskMapper.updateTaskNameByPlanId(planId, planName, plan.getStartDate(), plan.getEndDate());
 
-        for (CoreDrillPlan drillPlan : planList) {
-            final CoreDrillPlanDataVo dataVo = getCoreDrillPlanDataVo(drillPlan.getId());
-            CompletableFuture.runAsync(() -> {
-                //说明有任务并且都没执行过，需要重新生成任务
-                coreDrillTaskService.createTaskForNow(dataVo, plan.getPlanStartDate(), plan.getPlanEndDate());
-            }, threadPoolTaskExecutor);
-        }
     }
 
     private void deletePlanAndTaskByParentPlanId(Long planId) {
@@ -316,74 +327,32 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         }
     }
 
-    private void updateCommonPlan(CoreDrillPlan plan) {
-        /*
-                   判断能否修改: 如果上面返回了true; 说明两种情况
-                   1:计划生成了任务,但是未执行:  此时需要删除所有任务,修改计划数据后重新创建任务
-                   2:计划生成了任务且执行了,但是没有修改到关键信息,此时则不能删除任务,只允许修改计划信息
-
-         */
-        final Integer done = coreDrillTaskMapper.checkHasTaskIsDone(Arrays.asList(plan.getId()));
-        if (ObjectUtil.equal(1, done)) {
-            //此为情况二, 计划生成了任务且执行 不能删除任务,只允许修改计划信息,所以直接返回
-            //TODO 考虑是否同步修改已生成的任务的名称
-            return;
-        }
-
-        if (plan.getPlanStatus() == DrillPlanStatus.DELETED.getCode()) {
-            log.info("计划已被修改为" + DrillPlanStatus.DELETED.getDesc() + "，不再生成任务!");
-            return;
-        }
-
-        //此为情况一,计划没有生成任务或者生成了任务但未执行
-        final CoreDrillPlanDataVo dataVo = getCoreDrillPlanDataVo(plan.getId());
-        if (ObjectUtil.equal(1, plan.getBuildTaskNow()) && ObjectUtil.equal(DrillPlanStatus.USING.getCode(), plan.getPlanStatus())) {
-            coreDrillTaskMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
-            CompletableFuture.runAsync(() -> {
-                //说明有任务并且都没执行过，需要重新生成任务
-                coreDrillTaskService.createTaskForNow(dataVo, plan.getPlanStartDate(), plan.getPlanEndDate());
-            }, threadPoolTaskExecutor);
+    private void updateCommonPlan(CoreDrillPlan plan, CoreDrillPlanUpdateDto request) {
+        //使用中的普通计划
+        if (plan.getExecTimes() > request.getExecTimes()) {
+            throw new RuntimeException("执行次数不能小于基准计划执行次数!");
         }
+        String errorMsg = "子计划仅允许修改培训频次!";
+        validatePlanForStandard(request, plan, errorMsg, 0);
+        doUpdatePlan(plan, request);
     }
 
-    private Boolean checkCanUpdate(CoreDrillPlanUpdateDto request, CoreDrillPlan plan) {
-        if (ObjectUtil.isAllEmpty(request.getExecOrgType(), request.getPlanExecOrgIdList())) {
-            throw new RuntimeException("培训机构类型和执行机构不能同时为空!");
-        }
 
-        // 如果是下发的计划，执行频次不应低于省联社下发时设定的次数
-        if (ObjectUtil.equal(plan.getStandard(), 0)) {
-            validatePlanForStandard(request, plan);
+    private void validatePlanForStandard(CoreDrillPlanUpdateDto request, CoreDrillPlan plan, String errorMsg, Integer type) {
+        validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), errorMsg);
+        validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), errorMsg);
+        List<Long> execOrgIdList = coreDrillPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
+        validateListForStandard(execOrgIdList, request.getPlanExecOrgIdList(), errorMsg);
+        validateFieldForStandard(request.getRemark(), plan.getRemark(), errorMsg);
+        validateFieldForStandard(JSON.toJSONString(request.getFileList()), plan.getFileList(), errorMsg);
+        if (type == 0) {
+            //标准计划可以修改名称
+            validateFieldForStandard(request.getPlanName(), plan.getPlanName(), errorMsg);
         }
-
-        final Long planId = plan.getId();
-        boolean flag = true;
-
-        // 判断计划是否有任务已经执行过
-        Integer done = coreDrillTaskMapper.checkHasTaskIsDone(Arrays.asList(planId));
-
-        // 判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
-        Integer standardPlanHasDone = coreDrillTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
-        if (standardPlanHasDone != null) {
-            throw new RuntimeException("该计划下存在任务已执行的情况,无法修改!");
+        if (type != 0) {
+            //子计划可以修改执行次数，但只能增加不能减少
+            validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), errorMsg);
         }
-
-        // 验证计划
-        flag = validatePlan(request, plan, planId, true);
-
-        return null == done || flag;
-    }
-
-    private void validatePlanForStandard(CoreDrillPlanUpdateDto request, CoreDrillPlan plan) {
-        if (request.getExecTimes() < plan.getExecTimes()) {
-            throw new RuntimeException("培训次数不应低于基准次数!");
-        }
-        validateFieldForStandard(request.getPlanStatus(), plan.getPlanStatus(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getPlanName(), plan.getPlanName(), "下发计划仅允许修改培训次数!");
-
-        validateRoleAndOrgForStandard(request, plan);
     }
 
     private void validateFieldForStandard(Object requestValue, Object planValue, String errorMessage) {
@@ -392,56 +361,14 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         }
     }
 
-    private void validateRoleAndOrgForStandard(CoreDrillPlanUpdateDto request, CoreDrillPlan plan) {
-        // 执行角色
-        List<Long> roleIdLit = coreDrillPlanToRoleMapper.selectRoleIdByPlanId(plan.getId());
-        List<Long> planRoleId = request.getPlanRoleId();
-        if (ObjectUtil.isEmpty(planRoleId)) {
-            throw new RuntimeException("下发计划仅允许修改培训次数!");
-        }
-        validateListForStandard(roleIdLit, planRoleId, "下发计划仅允许修改培训次数!");
-
-        // 执行机构
-        List<Long> execOrgIdList = coreDrillPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
-        List<Long> planExecOrgIdList = request.getPlanExecOrgIdList();
-        validateListForStandard(execOrgIdList, planExecOrgIdList, "下发计划仅允许修改培训次数!");
-    }
-
     private void validateListForStandard(List<Long> planList, List<Long> requestList, String errorMessage) {
         if (planList.size() != requestList.size() || !planList.containsAll(requestList)) {
             throw new RuntimeException(errorMessage);
         }
     }
 
-    private boolean validatePlan(CoreDrillPlanUpdateDto request, CoreDrillPlan plan, Long planId, boolean flag) {
-        flag = flag && validateField(request.getPlanStatus(), plan.getPlanStatus());
-        flag = flag && validateField(request.getPlanCycle(), plan.getPlanCycle());
-        flag = flag && validateField(request.getExecOrgType(), plan.getExecOrgType());
-        flag = flag && validateField(request.getFileList(), plan.getFileList());
-
-        // 执行角色
-        List<Long> roleIdLit = coreDrillPlanToRoleMapper.selectRoleIdByPlanId(planId);
-        List<Long> planRoleId = request.getPlanRoleId();
-        flag = flag && !ObjectUtil.isEmpty(planRoleId) && roleIdLit.containsAll(planRoleId);
-
-        // 执行机构
-        List<Long> execOrgIdList = coreDrillPlanToExecOrgMapper.selectOrgIdByPlanId(planId);
-        List<Long> planExecOrgIdList = request.getPlanExecOrgIdList();
-        flag = flag && validateList(execOrgIdList, planExecOrgIdList);
-
-        return flag;
-    }
-
-    private boolean validateField(Object requestValue, Object planValue) {
-        return ObjectUtil.equal(requestValue, planValue);
-    }
-
-    private boolean validateList(List<Long> planList, List<Long> requestList) {
-        return planList.size() == requestList.size() && planList.containsAll(requestList);
-    }
-
 
-    public List<CoreDrillPlanToRole> batchSavePlanToRole(List<Long> roleIdList, Long planId) {
+    public void batchSavePlanToRole(List<Long> roleIdList, Long planId) {
         List<CoreDrillPlanToRole> planRoleList = new ArrayList<>();
         for (Long roleId : roleIdList) {
             CoreDrillPlanToRole role = new CoreDrillPlanToRole();
@@ -452,10 +379,9 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         if (CollectionUtil.isNotEmpty(planRoleList)) {
             coreDrillPlanToRoleService.saveBatch(planRoleList);
         }
-        return planRoleList;
     }
 
-    public List<CoreDrillPlanToExecOrg> batchSavePlanToExecOrg(List<Long> orgIdList, Long planId) {
+    public void batchSavePlanToExecOrg(List<Long> orgIdList, Long planId) {
 
         List<CoreDrillPlanToExecOrg> planOrgList = new ArrayList<CoreDrillPlanToExecOrg>();
         for (Long orgId : orgIdList) {
@@ -468,7 +394,6 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             coreDrillPlanToExecOrgService.saveBatch(planOrgList);
         }
 
-        return planOrgList;
     }
 
     /**
@@ -555,7 +480,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         }
         // 下发 按钮显示逻辑:仅省联社安全保卫管理人员进入且由省联社管理安全保卫人员创建的计划才显示
         //todo 判断当前人的角色信息
-        List<CoreDrillPlan> list = buildPlanData(plan, new ArrayList<>(),true);
+        List<CoreDrillPlan> list = buildPlanData(plan, new ArrayList<>(), true);
         //下发后修改为使用中
         plan.setPlanStatus(DrillPlanStatus.USING.getCode());
         plan.setIssue(1);
@@ -586,7 +511,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         DateRange range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
         List<Long> list = coreDrillPlanMapper.selectIdByParentId(planId);
         coreDrillPlanMapper.updatePlanStatusByIdOrParentId(planId, EduTrainingPlanStatus.DELETED.getCode());
-        coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list,range.getStartTime(),range.getEndTime());
+        coreDrillTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, range.getStartTime(), range.getEndTime());
         return coreDrillPlanMapper.updateById(plan);
     }
 
@@ -632,7 +557,7 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         );
     }
 
-    private List<CoreDrillPlan> buildPlanData(CoreDrillPlan plan, List<CoreDrillPlanToRole> planRoleList,boolean isPublish) {
+    private List<CoreDrillPlan> buildPlanData(CoreDrillPlan plan, List<CoreDrillPlanToRole> planRoleList, boolean isPublish) {
         if (ObjectUtil.isEmpty(planRoleList)) {
             //获取执行角色
             LambdaQueryWrapper<CoreDrillPlanToRole> ros = new LambdaQueryWrapper<>();

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/mapper/CoreEduTrainingPlanMapper.java

@@ -83,4 +83,6 @@ public interface CoreEduTrainingPlanMapper extends BaseMapper<CoreEduTrainingPla
     int updatePlanStatus(@Param("planId") Long planId, @Param("status") int status);
 
     void updatePlanStatusByIdOrParentId(@Param("planId") Long planId, @Param("status") int status);
+
+    void updatePlanStatusByIdList(@Param("list") List<Long> list, @Param("status") int status);
 }

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/edu/service/impl/CoreEduTrainingPlanServiceImpl.java

@@ -22,6 +22,7 @@ import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDataVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanDetailVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanPageVo;
 import com.xunmei.common.core.domain.edu.vo.CoreEduTrainingPlanRoleVo;
+import com.xunmei.common.core.enums.EduTrainingPlanCycleEnum;
 import com.xunmei.common.core.enums.OrgTypeEnum;
 import com.xunmei.common.core.enums.edu.EduTrainingPlanStatus;
 import com.xunmei.common.core.utils.AssertUtil;
@@ -242,149 +243,95 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     public int updateCoreEduTrainingPlan(CoreEduTrainingPlanEditDto request) {
         final CoreEduTrainingPlan plan = getById(request.getId());
 
-        if (plan.getPlanStatus()==EduTrainingPlanStatus.DRAFT.getCode()) {
-            throw new RuntimeException("当前计划已被删除,无法修改!");
+        if (plan.getPlanStatus() == EduTrainingPlanStatus.DRAFT.getCode()) {
+            //草稿状态 可以修改计划
+            doUpdatePlan(plan, request);
         }
 
-
-        //此处判断能否修改,如果可以 需要删除任务,且还需要判断是否需要生成任务
-        Boolean can = checkCanUpdate(request, plan);
-        if (!can) {
-            throw new RuntimeException("当前任务已生成且存在已执行情况,无法修改培训机构类型,具体培训机构,培训角色,培训周期，状态等信息!");
-        }
-        //可以修改计划
-        BeanUtils.copyProperties(request, plan);
-        plan.setUpdateTime(DateUtils.getNowDate());
-        plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
-        plan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
-        coreEduTrainingPlanToRoleMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
-        //List<CoreEduTrainingPlanToRole> trainingPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
-        coreEduTrainingPlanToExecOrgMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
-        batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
-        final int i = coreEduTrainingPlanMapper.updateById(plan);
         if (plan.getStandard() == 1) {
-            //如果标准计划可以修改，那么需要删除所有计划与任务，重新创建计划任务
-            updateStandardPlan(plan, null);//移除角色属性
+            //标准计划
+            updateStandardPlan(plan, request);
         } else {
-            //普通计划
-            updateCommonPlan(plan);
-        }
-
-
-        return i;
-    }
-
-    private void updateStandardPlan(CoreEduTrainingPlan plan, List<CoreEduTrainingPlanToRole> trainingPlanToRoleList) {
-        //没下发的就不管
-        if (0 == plan.getIssue()) {
-            return;
-        }
-        Long planId = plan.getId();
-        deletePlanAndTaskByParentPlanId(planId);
-        List<CoreEduTrainingPlan> planList = buildPlanData(plan, trainingPlanToRoleList, false);
-
-        if (plan.getPlanStatus() == EduTrainingPlanStatus.DELETED.getCode()) {
-            log.info("计划已被修改为" + EduTrainingPlanStatus.DELETED.getDesc() + "，不再生成任务!");
-            return;
+            //标准计划
+            updateCommonPlan(plan, request);
         }
 
-        for (CoreEduTrainingPlan trainingPlan : planList) {
-            CoreEduTrainingPlanDataVo dataVo = getCoreEduTrainingPlanDataVo(trainingPlan.getId());
-            CompletableFuture.runAsync(() -> {
-                //说明有任务并且都没执行过，需要重新生成任务
-                coreEduTrainingTaskService.createTaskForNow(dataVo, plan.getStartDate(), plan.getEndDate());
-            }, threadPoolTaskExecutor);
-        }
+        return 1;
     }
 
-    private void deletePlanAndTaskByParentPlanId(Long planId) {
-        //删除原有数据， 然后重新生成计划，任务
-        List<Long> planIdList = coreEduTrainingPlanMapper.selectAllIdByParentId(planId);
-        if (ObjectUtil.isEmpty(planIdList)) {
-            return;
+    private void updateCommonPlan(CoreEduTrainingPlan plan, CoreEduTrainingPlanEditDto request) {
+        //使用中的普通计划
+        if (plan.getExecTimes() > request.getExecTimes()) {
+            throw new RuntimeException("执行次数不能小于基准计划执行次数!");
         }
-        if (ObjectUtil.isNotEmpty(planIdList)) {
-            coreEduTrainingPlanMapper.deleteBatchIds(planIdList);
-            coreEduTrainingPlanToExecOrgMapper.delete(new LambdaQueryWrapper<CoreEduTrainingPlanToExecOrg>().in(CoreEduTrainingPlanToExecOrg::getPlanId, planIdList));
-            coreEduTrainingPlanToRoleMapper.delete(new LambdaQueryWrapper<CoreEduTrainingPlanToRole>().in(CoreEduTrainingPlanToRole::getPlanId, planIdList));
-        }
-        List<CoreEduTrainingTask> taskIdList = coreEduTrainingTaskMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTask>().in(CoreEduTrainingTask::getPlanId, planIdList).select(CoreEduTrainingTask::getId));
-        List<Long> collect = taskIdList.stream().map(CoreEduTrainingTask::getId).collect(Collectors.toList());
-        if (ObjectUtil.isNotEmpty(collect)) {
-            coreEduTrainingTaskMapper.deleteBatchIds(collect);
-            coreEduTrainingTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>().in(CoreEduTrainingTaskToRole::getEduTrainingTaskId, collect));
+        String errorMsg = "子计划仅允许修改培训频次!";
+        validatePlanForStandard(request, plan, errorMsg, 0);
+        doUpdatePlan(plan, request);
 
-        }
     }
 
-    private void updateCommonPlan(CoreEduTrainingPlan plan) {
-        /*
-                   判断能否修改: 如果上面返回了true; 说明两种情况
-                   1:计划生成了任务,但是未执行:  此时需要删除所有任务,修改计划数据后重新创建任务
-                   2:计划生成了任务且执行了,但是没有修改到关键信息,此时则不能删除任务,只允许修改计划信息
-
-         */
-        final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDone(Arrays.asList(plan.getId()));
-        if (ObjectUtil.equal(1, done)) {
-            //此为情况二, 计划生成了任务且执行 不能删除任务,只允许修改计划信息,所以直接返回
-            //TODO 考虑是否同步修改已生成的任务的名称
-            return;
-        }
-        if (plan.getPlanStatus() == EduTrainingPlanStatus.DELETED.getCode()) {
-            log.info("计划已被修改为" + EduTrainingPlanStatus.DELETED.getDesc() + "，不再生成任务!");
-            return;
-        }
-        //此为情况一,计划没有生成任务或者生成了任务但未执行
-        final CoreEduTrainingPlanDataVo dataVo = getCoreEduTrainingPlanDataVo(plan.getId());
-        if (ObjectUtil.equal(1, plan.getBuildTaskNow()) && ObjectUtil.equal(0, plan.getPlanStatus())) {
-            coreEduTrainingTaskMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
-            coreEduTrainingTaskToRoleMapper.delete(new LambdaQueryWrapper<CoreEduTrainingTaskToRole>().eq(CoreEduTrainingTaskToRole::getEduTrainingTaskId, plan.getId()));
-            CompletableFuture.runAsync(() -> {
-                //说明有任务并且都没执行过，需要重新生成任务
-                coreEduTrainingTaskService.createTaskForNow(dataVo, plan.getStartDate(), plan.getEndDate());
-            }, threadPoolTaskExecutor);
-        }
+    private void doUpdatePlan(CoreEduTrainingPlan plan, CoreEduTrainingPlanEditDto request) {
+        BeanUtils.copyProperties(request, plan);
+        plan.setUpdateTime(DateUtils.getNowDate());
+        plan.setFileList(ObjectUtil.isNotEmpty(request.getFileList()) ? JSON.toJSONString(request.getFileList()) : null);
+        plan.setUpdateBy(SecurityUtils.getLoginUser().getSysUser().getId().toString());
+        coreEduTrainingPlanToRoleMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
+        //List<CoreEduTrainingPlanToRole> trainingPlanToRoleList = batchSavePlanToRole(request.getPlanRoleId(), plan.getId());
+        coreEduTrainingPlanToExecOrgMapper.deleteByMap(MapUtil.of("plan_id", plan.getId()));
+        batchSavePlanToExecOrg(request.getPlanExecOrgIdList(), plan.getId());
+        coreEduTrainingPlanMapper.updateById(plan);
     }
 
-    private Boolean checkCanUpdate(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan) {
-        if (ObjectUtil.isAllEmpty(request.getExecOrgType(), request.getPlanExecOrgIdList())) {
-            throw new RuntimeException("培训机构类型和执行机构不能同时为空!");
-        }
-
-        // 如果是下发的计划，执行频次不应低于省联社下发时设定的次数
-        if (ObjectUtil.equal(plan.getStandard(), 0)) {
-            validatePlanForStandard(request, plan);
-        }
-
-        final Long planId = plan.getId();
-        boolean flag = true;
+    private void updateStandardPlan(CoreEduTrainingPlan plan, CoreEduTrainingPlanEditDto request) {
 
-        // 判断计划是否有任务已经执行过
-        Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDone(Arrays.asList(planId));
+        //使用中的标准计划
 
+        Long planId = plan.getId();
         // 判断标准计划能否修改:存在下发的计划生成了任务且任务存在已执行
         Integer standardPlanHasDone = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(planId);
-        if (standardPlanHasDone != null) {
-            throw new RuntimeException("该计划下存在任务已执行的情况,无法修改!");
+        if (standardPlanHasDone == 1) {
+            //验证修改的字段是否符合要求
+            String errorMsg = "有任务已执行或已过期,仅允许修改培训主题!";
+            validatePlanForStandard(request, plan, errorMsg, 1);
+            doUpdatePlan(plan, request);
+        } else {
+            doUpdatePlan(plan, request);
+            List<CoreEduTrainingPlan> list = lambdaQuery().eq(CoreEduTrainingPlan::getParentId, planId).select(CoreEduTrainingPlan::getId).list();
+            List<Long> collect = list.stream().map(CoreEduTrainingPlan::getId).collect(Collectors.toList());
+            coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(collect, null, null);
+            for (CoreEduTrainingPlan trainingPlan : list) {
+                CompletableFuture.runAsync(() -> {
+                    //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
+                    if ((ObjectUtil.equal(EduTrainingPlanStatus.USING.getCode(), plan.getPlanStatus())
+                            && (ObjectUtil.equal(EduTrainingPlanCycleEnum.NONE, plan.getPlanCycle()) || ObjectUtil.equal(1, plan.getBuildTaskNow())))) {
+                        CoreEduTrainingPlanDataVo detailPlanData = getCoreEduTrainingPlanDataVo(trainingPlan.getId());
+                        coreEduTrainingTaskService.createTaskForNow(detailPlanData, plan.getStartDate(), plan.getEndDate());
+                    }
+                }, threadPoolTaskExecutor);
+            }
         }
 
-        // 验证计划
-        flag = validatePlan(request, plan, planId, true);
+        //TODO 修改任务名称
+        //coreEduTrainingTaskMapper.updateTaskNameByPlanId(planId, planName, plan.getStartDate(), plan.getEndDate());
 
-        return null == done || flag;
     }
 
-    private void validatePlanForStandard(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan) {
-        if (request.getExecTimes() < plan.getExecTimes()) {
-            throw new RuntimeException("培训次数不应低于基准次数!");
-        }
-        validateFieldForStandard(request.getPlanStatus(), plan.getPlanStatus(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getPlanName(), plan.getPlanName(), "下发计划仅允许修改培训次数!");
-        validateFieldForStandard(request.getRemark(), plan.getRemark(), "下发计划仅允许修改培训次数!");
 
-        validateRoleAndOrgForStandard(request, plan);
+    private void validatePlanForStandard(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan, String errorMsg, Integer type) {
+        validateFieldForStandard(request.getPlanCycle(), plan.getPlanCycle(), errorMsg);
+        validateFieldForStandard(request.getExecOrgType(), plan.getExecOrgType(), errorMsg);
+        List<Long> execOrgIdList = coreEduTrainingPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
+        validateListForStandard(execOrgIdList, request.getPlanExecOrgIdList(), errorMsg);
+        validateFieldForStandard(request.getRemark(), plan.getRemark(), errorMsg);
+        validateFieldForStandard(JSON.toJSONString(request.getFileList()), plan.getFileList(), errorMsg);
+        if (type == 0) {
+            //标准计划可以修改名称
+            validateFieldForStandard(request.getPlanName(), plan.getPlanName(), errorMsg);
+        }
+        if (type != 0) {
+            //子计划可以修改执行次数，但只能增加不能减少
+            validateFieldForStandard(request.getExecTimes(), plan.getExecTimes(), errorMsg);
+        }
     }
 
     private void validateFieldForStandard(Object requestValue, Object planValue, String errorMessage) {
@@ -393,53 +340,12 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         }
     }
 
-    private void validateRoleAndOrgForStandard(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan) {
-        // 执行角色
-       /* List<Long> roleIdLit = coreEduTrainingPlanToRoleMapper.selectRoleIdByPlanId(plan.getId());
-        List<Long> planRoleId = request.getPlanRoleId();
-        if (ObjectUtil.isEmpty(planRoleId)) {
-            throw new RuntimeException("下发计划仅允许修改培训次数!");
-        }
-        validateListForStandard(roleIdLit, planRoleId, "下发计划仅允许修改培训次数!");*/
-
-        // 执行机构
-        List<Long> execOrgIdList = coreEduTrainingPlanToExecOrgMapper.selectOrgIdByPlanId(plan.getId());
-        List<Long> planExecOrgIdList = request.getPlanExecOrgIdList();
-        validateListForStandard(execOrgIdList, planExecOrgIdList, "下发计划仅允许修改培训次数!");
-    }
-
     private void validateListForStandard(List<Long> planList, List<Long> requestList, String errorMessage) {
         if (planList.size() != requestList.size() || !planList.containsAll(requestList)) {
             throw new RuntimeException(errorMessage);
         }
     }
 
-    private boolean validatePlan(CoreEduTrainingPlanEditDto request, CoreEduTrainingPlan plan, Long planId, boolean flag) {
-        flag = flag && validateField(request.getPlanStatus(), plan.getPlanStatus());
-        flag = flag && validateField(request.getPlanCycle(), plan.getPlanCycle());
-        flag = flag && validateField(request.getExecOrgType(), plan.getExecOrgType());
-
-        // 执行角色
-        List<Long> roleIdLit = coreEduTrainingPlanToRoleMapper.selectRoleIdByPlanId(planId);
-        List<Long> planRoleId = request.getPlanRoleId();
-        flag = flag && !ObjectUtil.isEmpty(planRoleId) && roleIdLit.containsAll(planRoleId);
-
-        // 执行机构
-        List<Long> execOrgIdList = coreEduTrainingPlanToExecOrgMapper.selectOrgIdByPlanId(planId);
-        List<Long> planExecOrgIdList = request.getPlanExecOrgIdList();
-        flag = flag && validateList(execOrgIdList, planExecOrgIdList);
-
-        return flag;
-    }
-
-    private boolean validateField(Object requestValue, Object planValue) {
-        return ObjectUtil.equal(requestValue, planValue);
-    }
-
-    private boolean validateList(List<Long> planList, List<Long> requestList) {
-        return planList.size() == requestList.size() && planList.containsAll(requestList);
-    }
-
     @Override
     public CoreEduTrainingPlanDataVo getCoreEduTrainingPlanDataVo(Long id) {
         final CoreEduTrainingPlanDataVo dataVo = coreEduTrainingPlanMapper.getDetailPlanData(id);
@@ -461,7 +367,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         return planRoleList;
     }
 
-    public List<CoreEduTrainingPlanToExecOrg> batchSavePlanToExecOrg(List<Long> orgIdList, Long planId) {
+    public void batchSavePlanToExecOrg(List<Long> orgIdList, Long planId) {
         List<CoreEduTrainingPlanToExecOrg> planOrgList = new ArrayList<CoreEduTrainingPlanToExecOrg>();
         for (Long orgId : orgIdList) {
             CoreEduTrainingPlanToExecOrg org = new CoreEduTrainingPlanToExecOrg();
@@ -473,7 +379,6 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             coreEduTrainingPlanToExecOrgService.saveBatch(planOrgList);
         }
 
-        return planOrgList;
     }
 
     /**
@@ -485,15 +390,25 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int deleteCoreEduTrainingPlanByIds(Long id) {
-        Integer count = coreEduTrainingTaskMapper.checkHasTaskIsDone(Collections.singletonList(id));
-        if (count != null && count > 0) {
-            throw new RuntimeException("已有任务完成，无法删除");
+        CoreEduTrainingPlan plan = getById(id);
+        if (EduTrainingPlanStatus.DRAFT.getCode() == plan.getPlanStatus()) {
+            removeById(id);
         }
         final Integer done = coreEduTrainingTaskMapper.checkHasTaskIsDoneByPlanParentId(id);
         if (done != null && done > 0) {
+            throw new RuntimeException("计划有已完成或者已逾期的任务，不能被删除");
+        }
+        List<Long> list = baseMapper.selectIdByParentId(id);
+        list.add(id);
+        coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, null, null);
+
+
+        Integer count = coreEduTrainingTaskMapper.checkHasTaskIsDone(Collections.singletonList(id));
+        if (count != null && count > 0) {
             throw new RuntimeException("已有任务完成，无法删除");
         }
-        final CoreEduTrainingPlan plan = getById(id);
+
+
         if (plan.getStandard() == 0) {
             //自建计划
             final List<CoreEduTrainingTask> coreEduTrainingTasks = coreEduTrainingTaskMapper.selectList(new LambdaQueryWrapper<CoreEduTrainingTask>()
@@ -576,16 +491,24 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         final CoreEduTrainingPlan plan = coreEduTrainingPlanMapper.selectById(planId);
         AssertUtil.isNotEmpty(plan, "计划不存在!");
         AssertUtil.equal(plan.getIssue(), 0, "计划已完成下发!");
-        List<CoreEduTrainingPlan> list = buildPlanData(plan, new ArrayList<>(), true);
+        List<CoreEduTrainingPlan> planList = lambdaQuery().eq(CoreEduTrainingPlan::getParentId, planId).select(CoreEduTrainingPlan::getId).list();
+        if (planList.isEmpty()){
+            planList = buildPlanData(plan, new ArrayList<>(), true);
+        }else {
+            planList.forEach(plan1 -> plan1.setPlanStatus(EduTrainingPlanStatus.USING.getCode()));
+            List<Long> collect = planList.stream().map(CoreEduTrainingPlan::getId).collect(Collectors.toList());
+            coreEduTrainingPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());
+        }
         //下发后修改为使用中
         plan.setPlanStatus(EduTrainingPlanStatus.USING.getCode());
         plan.setIssue(1);
         this.updateById(plan);
         //事务提交后执行
+        List<CoreEduTrainingPlan> finalPlanList = planList;
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronizationAdapter() {
             @Override
             public void afterCommit() {
-                for (CoreEduTrainingPlan trainingPlan : list) {
+                for (CoreEduTrainingPlan trainingPlan : finalPlanList) {
                     CompletableFuture.runAsync(() -> {
                         //如果不是省联社或者办事处，状态启用，并且是无周期或者立即生效
                         if ((ObjectUtil.equal(EduTrainingPlanStatus.USING.getCode(), plan.getPlanStatus())
@@ -682,7 +605,7 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         DateRange range = DateUtils.getStartAndEnd(new Date(), plan.getPlanCycle());
         List<Long> list = coreEduTrainingPlanMapper.selectIdByParentId(planId);
         coreEduTrainingPlanMapper.updatePlanStatusByIdOrParentId(planId, EduTrainingPlanStatus.DELETED.getCode());
-        coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list,range.getStartTime(),range.getEndTime());
+        coreEduTrainingTaskService.delByStartTimeAndEndTimeAndPlanIdList(list, range.getStartTime(), range.getEndTime());
         return coreEduTrainingPlanMapper.updateById(plan);
     }
 

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

@@ -390,7 +390,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
 
         if (plan.getPlanCycle() != 0) {
             //如果不是无周期的计划，那么需要查询出他的时间范围
-            DateRange dateRange = DateUtils.getStartAndEnd(new Date(),EduTrainingPlanCycleEnum.toCommmonEnum( plan.getPlanCycle()));
+            DateRange dateRange = DateUtils.getStartAndEnd(new Date(), EduTrainingPlanCycleEnum.toCommmonEnum(plan.getPlanCycle()));
             start = dateRange.getStartTime();
             end = dateRange.getEndTime();
         } else {
@@ -735,7 +735,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
                 //此处因为planService会导致循环依赖
                 final CoreEduTrainingPlanDataVo detailPlanData = coreEduTrainingPlanMapper.getDetailPlanData(plan.getId());
                 detailPlanData.setFileList(ObjectUtil.isNotEmpty(detailPlanData.getFile()) ? JSON.parseArray(detailPlanData.getFile(), String.class) : null);
-                DateRange range = DateUtils.getStartAndEnd(finalDate,EduTrainingPlanCycleEnum.toCommmonEnum( plan.getPlanCycle()) );
+                DateRange range = DateUtils.getStartAndEnd(finalDate, EduTrainingPlanCycleEnum.toCommmonEnum(plan.getPlanCycle()));
                 this.createTaskForNow(detailPlanData, range.getStartTime(), range.getEndTime());
             }, threadPoolTaskExecutor);
 
@@ -748,6 +748,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delTaskByIdList(List<Long> taskIdList) {
         if (ObjectUtil.isNotEmpty(taskIdList)) {
             coreEduTrainingTaskMapper.deleteBatchIds(taskIdList);
@@ -759,11 +760,12 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void delByStartTimeAndEndTimeAndPlanIdList(List<Long> planIdList, Date startTime, Date endTime) {
         if (ObjectUtil.isNotEmpty(planIdList)) {
             List<CoreEduTrainingTask> taskList = lambdaQuery()
-                    .ge(CoreEduTrainingTask::getStartDate, startTime)
-                    .le(CoreEduTrainingTask::getEndDate, endTime)
+                    .ge(ObjectUtil.isNotNull(startTime), CoreEduTrainingTask::getStartDate, startTime)
+                    .le(ObjectUtil.isNotNull(endTime), CoreEduTrainingTask::getEndDate, endTime)
                     .in(CoreEduTrainingTask::getPlanId, planIdList)
                     .select(CoreEduTrainingTask::getId)
                     .list();
@@ -916,7 +918,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private void dealTimeWorkChangeForMonthly(WorkTimeChangeEvent event, String todayStr, List<SysWorkTime> futureWorkTime) {
         List<Long> orgIds = event.getOrgIds();
         DateTime today = DateUtil.parse(todayStr, Constants.DAILY_FORMAT);
-        DateRange dateRange = DateUtils.getStartAndEnd(today,CycleCommonEnum.MONTHLY);
+        DateRange dateRange = DateUtils.getStartAndEnd(today, CycleCommonEnum.MONTHLY);
         //查询机构当周是否存在任务
         List<CoreEduTrainingTask> taskList = lambdaQuery()
                 .eq(CoreEduTrainingTask::getPlanCycle, EduTrainingPlanCycleEnum.MONTHLY.getCode())
@@ -962,7 +964,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private void dealTimeWorkChangeForQuarterly(WorkTimeChangeEvent event, String todayStr, List<SysWorkTime> futureWorkTime) {
         List<Long> orgIds = event.getOrgIds();
         DateTime today = DateUtil.parse(todayStr, Constants.DAILY_FORMAT);
-        DateRange dateRange = DateUtils.getStartAndEnd(today,CycleCommonEnum.QUARTERLY);
+        DateRange dateRange = DateUtils.getStartAndEnd(today, CycleCommonEnum.QUARTERLY);
         //查询机构当周是否存在任务
         List<CoreEduTrainingTask> taskList = lambdaQuery()
                 .eq(CoreEduTrainingTask::getPlanCycle, EduTrainingPlanCycleEnum.QUARTERLY.getCode())
@@ -1008,7 +1010,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private void dealTimeWorkChangeForHalfYearly(WorkTimeChangeEvent event, String todayStr, List<SysWorkTime> futureWorkTime) {
         List<Long> orgIds = event.getOrgIds();
         DateTime today = DateUtil.parse(todayStr, Constants.DAILY_FORMAT);
-        DateRange dateRange = DateUtils.getStartAndEnd(today,CycleCommonEnum.HALF_YEARLY);
+        DateRange dateRange = DateUtils.getStartAndEnd(today, CycleCommonEnum.HALF_YEARLY);
         //查询机构当周是否存在任务
         List<CoreEduTrainingTask> taskList = lambdaQuery()
                 .eq(CoreEduTrainingTask::getPlanCycle, EduTrainingPlanCycleEnum.HALF_YEARLY.getCode())
@@ -1055,7 +1057,7 @@ public class CoreEduTrainingTaskServiceImpl extends ServiceImpl<CoreEduTrainingT
     private void dealTimeWorkChangeForYearly(WorkTimeChangeEvent event, String todayStr, List<SysWorkTime> futureWorkTime) {
         List<Long> orgIds = event.getOrgIds();
         DateTime today = DateUtil.parse(todayStr, Constants.DAILY_FORMAT);
-        DateRange dateRange = DateUtils.getStartAndEnd(today,CycleCommonEnum.YEARLY);
+        DateRange dateRange = DateUtils.getStartAndEnd(today, CycleCommonEnum.YEARLY);
         //查询机构当周是否存在任务
         List<CoreEduTrainingTask> taskList = lambdaQuery()
                 .eq(CoreEduTrainingTask::getPlanCycle, EduTrainingPlanCycleEnum.YEARLY.getCode())

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingPlanMapper.xml

@@ -123,28 +123,28 @@
         <include refid="selectCoreEduTrainingPlanVo"/>
         where id = #{id}
     </select>
-<sql id="pageIncludeSP">
-    <if test="request.execOrgType!=null">
-        and sp.exec_org_type = #{request.execOrgType}
-    </if>
-    <if test="request.planCycle!=null">
-        and sp.plan_cycle = #{request.planCycle}
-    </if>
-    <if test="request.planStatus!=null">
-        and sp.plan_status = #{request.planStatus}
-    </if>
-    <if test="request.planName!=null">
-        and p.plan_name like concat('%',#{request.planName},'%')
-    </if>
-    <choose>
-        <when test="request.checkSub==true">
-            and sp.belong_org_path like concat(#{request.belongOrgPath},'%')
-        </when>
-        <otherwise>
-            and sp.belong_org_id = #{request.belongOrgId}
-        </otherwise>
-    </choose>
-</sql>
+    <sql id="pageIncludeSP">
+        <if test="request.execOrgType!=null">
+            and sp.exec_org_type = #{request.execOrgType}
+        </if>
+        <if test="request.planCycle!=null">
+            and sp.plan_cycle = #{request.planCycle}
+        </if>
+        <if test="request.planStatus!=null">
+            and sp.plan_status = #{request.planStatus}
+        </if>
+        <if test="request.planName!=null">
+            and p.plan_name like concat('%',#{request.planName},'%')
+        </if>
+        <choose>
+            <when test="request.checkSub==true">
+                and sp.belong_org_path like concat(#{request.belongOrgPath},'%')
+            </when>
+            <otherwise>
+                and sp.belong_org_id = #{request.belongOrgId}
+            </otherwise>
+        </choose>
+    </sql>
     <sql id="pageIncludeP">
         <if test="request.planName!=null">
             and p.plan_name like concat('%',#{request.planName},'%')
@@ -447,7 +447,7 @@
         from core_edu_training_plan p left join sys_user u on p.update_by=u.id
         where p.deleted = 0
         <if test="request.planRoleId!=null">
-            and p.id in (  select distinct p1.id
+            and p.id in ( select distinct p1.id
             from core_edu_training_plan p1
             inner join core_edu_training_plan_to_role r1 on p1.id = r1.plan_id
             where p1.deleted = 0
@@ -556,9 +556,9 @@
         <if test="request.planStatus!=null">
             and sp.plan_status = #{request.planStatus}
         </if>
-<!--        <if test="request.planName!=null">-->
-<!--            and sp.plan_name = #{request.planName}-->
-<!--        </if>-->
+        <!--        <if test="request.planName!=null">-->
+        <!--            and sp.plan_name = #{request.planName}-->
+        <!--        </if>-->
         <choose>
             <when test="request.checkSub==true">
                 and sp.belong_org_path like concat(#{request.belongOrgPath},'%')
@@ -584,10 +584,22 @@
     </select>
 
     <update id="updatePlanStatus">
-        update core_edu_training_plan set plan_status = #{status} where id = #{planId}
+        update core_edu_training_plan
+        set plan_status = #{status}
+        where id = #{planId}
     </update>
 
     <update id="updatePlanStatusByIdOrParentId">
-        update core_edu_training_plan set plan_status = #{status} where id = #{planId} or parent_id = #{planId}
+        update core_edu_training_plan
+        set plan_status = #{status}
+        where id = #{planId}
+           or parent_id = #{planId}
+    </update>
+
+    <update id="updatePlanStatusByIdList">
+        update core_edu_training_plan set plan_status = #{status} where id in
+        <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
     </update>
 </mapper>

soc-modules/soc-modules-core/src/main/resources/mapper/edu/CoreEduTrainingTaskMapper.xml

@@ -57,7 +57,7 @@
     </sql>
 
     <select id="checkHasTaskIsDone" resultType="java.lang.Integer">
-        select 1 from core_edu_training_task where status !=0 and plan_id in
+        select 1 from core_edu_training_task where status in (2,3) and plan_id in
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
             #{item}
         </foreach>
@@ -176,7 +176,7 @@
     <select id="checkHasTaskIsDoneByPlanParentId" resultType="java.lang.Integer">
         select 1
         from core_edu_training_task
-        where status != 0
+        where status in (2,3)
           and plan_id in
               (select id from core_edu_training_plan where plan_status = 0 and deleted = 0 and parent_id = #{planId})
         limit 1