item：plan状态属性统一

amos-boot-module/amos-boot-module-api/amos-boot-module-supervision-api/src/main/java/com/yeejoin/amos/supervision/dao/entity/Plan.java

@@ -195,8 +195,8 @@ public class Plan extends BasicEntity {
 	/**
      * 状态:0-已停用；1-正常
      */
-	@Column(name="[status]")
-	private byte status;
+	@Column(name="status")
+	private Integer status;
 	/**
 	 * 用户编号
 	 */
@@ -562,11 +562,11 @@ public class Plan extends BasicEntity {
 		this.scoreFormula = scoreFormula;
 	}
 
-	public byte getStatus() {
+	public Integer getStatus() {
 		return this.status;
 	}
 
-	public void setStatus(byte status) {
+	public void setStatus(Integer status) {
 		this.status = status;
 	}
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/PlanController.java

@@ -196,7 +196,7 @@ public class PlanController extends AbstractBaseController {
     @RequestMapping(value = "/setPlanStatus", produces = "application/json;charset=UTF-8", method = RequestMethod.GET)
     public CommonResponse setPlanStatus(
             @ApiParam(value = "计划id") @RequestParam(value = "planId", required = false) Long planId,
-            @ApiParam(value = "计划状态") @RequestParam(value = "status", required = false) byte status ) {
+            @ApiParam(value = "计划状态") @RequestParam(value = "status", required = false) Integer status ) {
         planService.setplanstatus(planId, status);
         return CommonResponseUtil.success();
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/controller/RoutePointItemController.java

@@ -52,7 +52,7 @@ public class RoutePointItemController extends AbstractBaseController {
     @ApiOperation(value = "新增巡检路线点项关系", notes = "新增巡检路线点项关系")
     @PostMapping(value = "/addRoutePointItem", produces = "application/json;charset=UTF-8")
     public CommonResponse addRoute(@ApiParam(value = "巡检计划", required = true) @RequestBody Plan plan,
-                                   @ApiParam(value = "检查项IDS", required = true) @RequestParam List<Long> inputItemIds,
+                                   @ApiParam(value = "检查项IDS", required = false) @RequestParam List<Long> inputItemIds,
                                    @ApiParam(value = "是否保存并提交", required = true) @RequestParam Boolean status) {
         try {
             String userId = getUserId();

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/dao/repository/IPlanDao.java

@@ -32,7 +32,7 @@ public interface IPlanDao extends BaseDao<Plan, Long> {
 
     @Modifying
     @Transactional
-    @Query(value = "UPDATE p_plan SET `status` = (?1) WHERE id IN (?2)", nativeQuery = true)
+    @Query(value = "UPDATE p_plan SET `status` = (?1) WHERE id = (?2)", nativeQuery = true)
     void updatePlanStatus(Integer status, Long planId);
 
     Plan findByOriginalId(String originalId);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/PlanServiceImpl.java

@@ -241,7 +241,7 @@ public class PlanServiceImpl implements IPlanService {
         for (long planId : planIds) {
             List<Plan> planList = getPlanByRouteId(planId);
             for (Plan plan : planList) {
-                plan.setStatus((byte) 1);
+                plan.setStatus(1);
                 planDao.save(plan);
             }
         }
@@ -270,7 +270,7 @@ public class PlanServiceImpl implements IPlanService {
     }
 
     @Override
-    public void setplanstatus (Long id, byte status) {
+    public void setplanstatus (Long id, Integer status) {
         Plan oriPlan = planDao.findById(id).get();
         oriPlan.setStatus(status);
         planDao.save(oriPlan);

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/impl/SynDataServiceImpl.java

@@ -294,7 +294,7 @@ public class SynDataServiceImpl implements ISynDataService {
         plan.setMinSpace(0);
         plan.setIsScore("1");
         plan.setError(0);
-        plan.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_START));
+        plan.setStatus(Integer.parseInt(XJConstant.PLAN_STATUS_START));
         plan.setNextGenDate(DateUtil.getIntervalDate(now, 0));
         plan.setCreateBy(userId.toString());
         plan.setRemark1(synPlanParam.getRemark());
@@ -381,7 +381,7 @@ public class SynDataServiceImpl implements ISynDataService {
     public CommonResponse stopPlan(String originalId) {
         Plan plan = iPlanDao.findByOriginalId(originalId);
         if (plan != null) {
-            plan.setStatus(Byte.parseByte(XJConstant.PLAN_STATUS_STOP));
+            plan.setStatus(Integer.parseInt(XJConstant.PLAN_STATUS_STOP));
             iPlanDao.save(plan);
             List<PlanTask> planTasks = iplanTaskDao.findByPlanId(plan.getId());
             if (!CollectionUtils.isEmpty(planTasks)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-supervision-biz/src/main/java/com/yeejoin/amos/supervision/business/service/intfc/IPlanService.java

@@ -76,7 +76,7 @@ public interface IPlanService {
 	/**
 	 * 计划启用停用
 	 */
-	void setplanstatus(Long id, byte status);
+	void setplanstatus(Long id, Integer status);
 
 	/**
 	 * 获取计划详情