调整履职下发

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

@@ -115,7 +115,7 @@ public class ApiPlanController {
         try {
             appPlanService.saveOrUpdatePlan(info);
             //立即执行
-            if (info.isBuildTaskNow()) {
+            if (info.getOrgType()==3&&info.isBuildTaskNow()) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建

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

@@ -208,7 +208,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         //修改所有子计划
         List<AppPlan> appPlans = baseMapper.selectList(new LambdaQueryWrapper<AppPlan>().eq(AppPlan::getParentId, id));
         //如果不存在子计划直接返回
-        if(appPlans==null||appPlans.size()==0){
+        if (appPlans == null || appPlans.size() == 0) {
             return 0;
         }
         for (AppPlan ap :
@@ -279,7 +279,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             if (size > 0) {
                 throw new RuntimeException("计划名称重复，请确认！");
             }
-
+            //如果计划为行社并且勾选立即生效
+            if (app.getOrgType()==3&&app.isBuildTaskNow()) {
+                plan.setPlanStatus(1);
+            } else {
+                plan.setPlanStatus(0);
+            }
             plan.setDistribute("0");
             baseMapper.insert(plan);
             Long id = plan.getId();