处理演练培训下发后立即生效,撤回,再次下发但下周期生效仍然生成了任务

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

@@ -705,13 +705,14 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
         plan.setPlanStatus(DrillPlanStatus.USING.getCode());
         plan.setIssue(1);
         this.updatePlanTime(plan, status);
-        this.updateById(plan);
         if (ObjectUtil.equal(status, 1)) {
             //status=1:立即生效  status=0:下周期生效
             plan.setBuildTaskNow(1);
         } else {
             plan.setBuildTaskNow(0);
         }
+        this.updateById(plan);
+
 
         final CompletableFuture<List<CoreDrillPlan>> planListFuture = CompletableFuture.supplyAsync(() -> {
             List<CoreDrillPlan> planList = lambdaQuery()
@@ -720,9 +721,14 @@ public class CoreDrillPlanServiceImpl extends ServiceImpl<CoreDrillPlanMapper, C
             if (planList.isEmpty()) {
                 planList = buildPlanData(plan, new ArrayList<>(), true, status);
             } else {
-                planList.forEach(plan1 -> plan1.setPlanStatus(EduTrainingPlanStatus.USING.getCode()));
+                for (CoreDrillPlan drillPlan : planList) {
+                    drillPlan.setPlanStatus(DrillPlanStatus.USING.getCode());
+                    drillPlan.setBuildTaskNow(plan.getBuildTaskNow());
+                    updateById(drillPlan);
+                }
+               /* planList.forEach(plan1 -> plan1.setPlanStatus(EduTrainingPlanStatus.USING.getCode()));
                 List<Long> collect = planList.stream().map(CoreDrillPlan::getId).collect(Collectors.toList());
-                coreDrillPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());
+                coreDrillPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());*/
             }
             return planList;
         }, threadPoolTaskExecutor);

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

@@ -714,13 +714,13 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
         plan.setPlanStatus(EduTrainingPlanStatus.USING.getCode());
         plan.setIssue(1);
         this.updatePlanTime(plan, status);
-        this.updateById(plan);
         if (ObjectUtil.equal(status, 1)) {
             //status=1:立即生效  status=0:下周期生效
             plan.setBuildTaskNow(1);
         } else {
             plan.setBuildTaskNow(0);
         }
+        this.updateById(plan);
 
         final CompletableFuture<List<CoreEduTrainingPlan>> planListFuture = CompletableFuture.supplyAsync(() -> {
             List<CoreEduTrainingPlan> planList = lambdaQuery()
@@ -729,9 +729,14 @@ public class CoreEduTrainingPlanServiceImpl extends ServiceImpl<CoreEduTrainingP
             if (planList.isEmpty()) {
                 planList = buildPlanData(plan, new ArrayList<>(), true, status);
             } else {
-                planList.forEach(plan1 -> plan1.setPlanStatus(EduTrainingPlanStatus.USING.getCode()));
+                for (CoreEduTrainingPlan trainingPlan : planList) {
+                    trainingPlan.setPlanStatus(EduTrainingPlanStatus.USING.getCode());
+                    trainingPlan.setBuildTaskNow(plan.getBuildTaskNow());
+                    updateById(trainingPlan);
+                }
+               /* 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());
+                coreEduTrainingPlanMapper.updatePlanStatusByIdList(collect, EduTrainingPlanStatus.USING.getCode());*/
             }
             return planList;
         }, threadPoolTaskExecutor);