子计划不小于父计划

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/controller/ApiPlanController.java

@@ -152,7 +152,7 @@ public class ApiPlanController {
                 planOfOrgType = plan.getPlanOfOrgType();
             }
             //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
-            boolean isEditAll = info.getHasEdit() == null && info.getId() != null;
+            boolean isEditAll = info.getHasEdit() == null && info.getId() != null&&info.getBuildTaskNow()>0;
             //如果计划所属机构类型为行社并且勾选立即执行,新增的时候立即生成任务
             if ( isEditAll) {
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/safetyCheck/controller/CoreSafecheckPlanController.java

@@ -119,9 +119,10 @@ public class CoreSafecheckPlanController extends BaseController {
     @Log(title = "常规安全检查计划", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody CoreSafecheckPlan coreSafecheckPlan) throws Exception {
+        Long planId = coreSafecheckPlan.getId();
         Long returnId = coreSafecheckPlanService.insertCoreSafecheckPlan(coreSafecheckPlan);
         //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
-        boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && coreSafecheckPlan.getId() != null;
+        boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && planId != null&&coreSafecheckPlan.isBuildTaskNow();
         //如果是新增计划并且勾选立即执行并且是行社或者无周期,立即生成计划
         if (isEditAll) {
             CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
@@ -130,15 +131,15 @@ public class CoreSafecheckPlanController extends BaseController {
             plans.add(plan);
             jobBusiness.createTaskByPlans(plans);
         }
-        if (isEditAll) {
-            CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
-//获取父计划下面所有父id相等并且未删除并且已启用的计划
-            List<CoreSafecheckPlan> plans = coreSafecheckPlanService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, plan.getId()).eq(CoreSafecheckPlan::getIsDeleted, 0).eq(CoreSafecheckPlan::getPlanStatus, 1));
-            if(plan.getPlanOfOrgType()==3) {
-                plans.add(plan);
-            }
-            jobBusiness.createTaskByPlans(plans);
-        }
+//        if (isEditAll) {
+//            CoreSafecheckPlan plan = coreSafecheckPlanService.getById(returnId);
+////获取父计划下面所有父id相等并且未删除并且已启用的计划
+//            List<CoreSafecheckPlan> plans = coreSafecheckPlanService.list(new LambdaQueryWrapper<CoreSafecheckPlan>().eq(CoreSafecheckPlan::getParentId, plan.getId()).eq(CoreSafecheckPlan::getIsDeleted, 0).eq(CoreSafecheckPlan::getPlanStatus, 1));
+//            if(plan.getPlanOfOrgType()==3) {
+//                plans.add(plan);
+//            }
+//            jobBusiness.createTaskByPlans(plans);
+//        }
         return success();
     }