子计划不小于父计划

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

@@ -154,31 +154,8 @@ public class ApiPlanController {
             //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
             boolean isEditAll = info.getHasEdit() == null && info.getId() != null;
             //如果计划所属机构类型为行社并且勾选立即执行,新增的时候立即生成任务
-            if ((info.getId() == null &&planOfOrgType!=null&& planOfOrgType == 3 && info.getBuildTaskNow() == 1) || isEditAll) {
-//                    DateTime datetime = new DateTime();
-//                    datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
-//                    //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
-//                    Integer plancycle = info.getPlanCycle();
-//                    if (plancycle != null) {
-//                        if (plancycle == 2) {
-//                            taskBusiness.syncDay(datetime, plancycle);
-//                        }
-//                        if (plancycle == 3) {
-//                            taskBusiness.syncWeek(datetime, plancycle);
-//                        }
-//                        if (plancycle == 4) {
-//                            taskBusiness.syncMonth(datetime, plancycle);
-//                        }
-//                        if (plancycle == 5) {
-//                            taskBusiness.syncQuarter(datetime, plancycle);
-//                        }
-//                        if (plancycle == 6) {
-//                            taskBusiness.syncHalfYear(datetime, plancycle);
-//                        }
-//                        if (plancycle == 7) {
-//                            taskBusiness.syncYear(datetime, plancycle);
-//                        }
-//                    }
+            if ( isEditAll) {
+
                 //如果编辑
                 List<AppPlan> list = appPlanService.list(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, plan.getId()).eq(AppPlan::getDeleted, 0));
                 list.add(plan);

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -303,15 +303,17 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
             plan.setBuildTaskNow(app.getBuildTaskNow());
             plan.setDistribute("0");
+            plan.setPlanStatus(0);
             //设置计划所属机构类型
             plan.setPlanOfOrgType(Long.valueOf(orgService.selectSysOrgById(app.getPlanCreateOrgId(), SecurityConstants.INNER).getType()));
             //如果计划所属机构类型为行社
-            if (plan.getPlanOfOrgType() == 3 ) {
-                plan.setPlanStatus(1);
-                plan.setDistribute("1");
-            } else {
-                plan.setPlanStatus(0);
-            }
+//            if (plan.getPlanOfOrgType() == 3 ) {
+//                plan.setPlanStatus(1);
+//                plan.setDistribute("1");
+//            } else {
+//                plan.setPlanStatus(0);
+//            }
+
             baseMapper.insert(plan);
             Long id = plan.getId();
 

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

@@ -123,7 +123,7 @@ public class CoreSafecheckPlanController extends BaseController {
         //判断是否是编辑并且计划所属任务不存在已完成或者逾期,需要删除所有任务重新生成
         boolean isEditAll = coreSafecheckPlan.getHasEdit() == null && coreSafecheckPlan.getId() != null;
         //如果是新增计划并且勾选立即执行并且是行社或者无周期,立即生成计划
-        if (coreSafecheckPlan.getId() == null && coreSafecheckPlan.isBuildTaskNow() && (coreSafecheckPlan.getPlanOfOrgType() == 3 || coreSafecheckPlan.getPlanCycle() == 6)) {
+        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::getDistribute, 1));

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

@@ -298,15 +298,17 @@ public class CoreSafecheckPlanServiceImpl extends ServiceImpl<CoreSafecheckPlanM
             coreSafecheckPlan.setCreateTime(DateUtils.getNowDate());
             coreSafecheckPlan.setModifiedBy(SecurityUtils.getUserId());
             coreSafecheckPlan.setDistribute("0");
+            coreSafecheckPlan.setPlanStatus(0L);
             //计划所属机构类型
             coreSafecheckPlan.setPlanOfOrgType(orgService.selectSysOrgById(coreSafecheckPlan.getPlanOfOrgId(), SecurityConstants.INNER).getType());
             //如果是行社并且勾选了立即下发需要修改下发状态为已下发,因为会立即触发下发动作
-            if (coreSafecheckPlan.getPlanOfOrgType() == 3) {
-                coreSafecheckPlan.setPlanStatus(1L);
-                coreSafecheckPlan.setDistribute("1");
-            } else {
-                coreSafecheckPlan.setPlanStatus(0L);
-            }
+//            if (coreSafecheckPlan.getPlanOfOrgType() == 3) {
+//                coreSafecheckPlan.setPlanStatus(1L);
+//                coreSafecheckPlan.setDistribute("1");
+//            } else {
+//                coreSafecheckPlan.setPlanStatus(0L);
+//            }
+
             coreSafecheckPlanMapper.insert(coreSafecheckPlan);
             returnId = coreSafecheckPlan.getId();
         } else {