调整计划

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

@@ -72,7 +72,7 @@ public class ApiPlanController {
             appPlanService.distributeToOrg(dto);
             AppPlanVo plan = appPlanService.findById(dto.getId());
             //如果选择了计划立即生效
-            if (plan.isBuildTaskNow()) {
+            if (plan.getBuildTaskNow()==1) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建
@@ -148,7 +148,7 @@ public class ApiPlanController {
         try {
             appPlanService.saveOrUpdatePlan(info);
             //立即执行
-            if (info.getOrgType()==3&&info.isBuildTaskNow()) {
+            if (info.getExecOrgType()==3&&info.getBuildTaskNow()==1) {
                 DateTime datetime = new DateTime();
                 datetime.setTimeZone(TimeZone.getTimeZone("Asia/Shanghai"));
                 //当有周期存在时保持原有接口不变（doTask），否则按照新的接口创建

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/domain/AppPlan.java

@@ -158,7 +158,7 @@ public class AppPlan extends Model<AppPlan> implements Serializable {
 
     @TableField(exist = false)
     private String orgId;
-    private boolean buildTaskNow;
+    private Integer buildTaskNow;
 
     @TableLogic(value = "0", delval = "1")
     @ApiModelProperty(value = "是否删除 1是 0否")

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

@@ -180,6 +180,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setId(dto.getId());
         plan.setDistribute("1");
         plan.setPlanStatus(1);
+        plan.setBuildTaskNow(null);
         baseMapper.updateById(plan);
     }
 
@@ -220,6 +221,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         //设置下发状态为下发
         plan.setDistribute("1");
         plan.setPlanStatus(1);
+
         baseMapper.updateById(plan);
         return 1;
     }
@@ -280,12 +282,12 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
                 throw new RuntimeException("计划名称重复，请确认！");
             }
             //如果计划为行社并且勾选立即生效
-            if (app.getOrgType()==3&&app.isBuildTaskNow()) {
+            if (app.getExecOrgType() == 3 && app.getBuildTaskNow()==1) {
                 plan.setPlanStatus(1);
             } else {
                 plan.setPlanStatus(0);
             }
-            plan.setBuildTaskNow(app.isBuildTaskNow());
+            plan.setBuildTaskNow(app.getBuildTaskNow());
             plan.setDistribute("0");
             baseMapper.insert(plan);
             Long id = plan.getId();
@@ -604,7 +606,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
         plan.setExecOrgType(app.getExecOrgType());
         plan.setDistributePlanStatus(app.getDistributePlanStatus());
         plan.setCount(app.getCount());
-
+        plan.setBuildTaskNow(app.getBuildTaskNow());
         return plan;
     }
 
@@ -637,6 +639,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
 
         plan.setId(app.getId());
         plan.setNotResumptionOnRest(app.getNotResumptionOnRest());
+        plan.setBuildTaskNow(app.getBuildTaskNow());
         return plan;
     }
 

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/vo/appPlan/AppPlanVo.java

@@ -23,7 +23,7 @@ public class AppPlanVo extends PageDto<AppPlan> {
 
     private List<Long> ids;
     private Long id;
-    private boolean buildTaskNow;
+    private Integer buildTaskNow;
     /**
      * 计划名称
      */