设备bug修复

src/main/java/com/glxp/api/common/req/UpdateRequest.java

@@ -49,4 +49,5 @@ public class UpdateRequest {
 
     private Date expectedTime;
 
+    private Integer planStatus;
 }

src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java

@@ -96,7 +96,7 @@ public class DeviceInspectPlanController {
         if (null == updateRequest || StrUtil.isBlank(updateRequest.getOrderId())) {
             return ResultVOUtils.paramVerifyFail();
         }
-        return deviceInspectPlanService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus(), updateRequest.getInspectUser(),updateRequest.getExpectedTime());
+        return deviceInspectPlanService.updateStatus(updateRequest.getOrderId(), updateRequest.getStatus(), updateRequest.getInspectUser(),updateRequest.getExpectedTime(),updateRequest.getPlanStatus());
     }
 
     /**

src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java

@@ -53,7 +53,7 @@ public interface DeviceInspectPlanService {
      * @param status
      * @return
      */
-    BaseResponse updateStatus(String orderId, Integer status, String inspectUser, Date expectedTime);
+    BaseResponse updateStatus(String orderId, Integer status, String inspectUser, Date expectedTime,Integer planStatus);
 
     /**
      * 删除巡检计划

src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java

@@ -104,12 +104,13 @@ public class DeviceInspectPlanServiceImpl implements DeviceInspectPlanService {
     }
 
     @Override
-    public BaseResponse updateStatus(String orderId, Integer status, String inspectUser,Date expectedTime) {
+    public BaseResponse updateStatus(String orderId, Integer status, String inspectUser,Date expectedTime,Integer planStatus) {
         if (StrUtil.isBlank(orderId) || null == status) {
             return ResultVOUtils.paramVerifyFail();
         }
         DeviceInspectPlanEntity deviceInspectPlanEntity = deviceInspectPlanDao.selectByOrderId(orderId);
         deviceInspectPlanEntity.setStatus(status);
+        deviceInspectPlanEntity.setPlanStatus(planStatus);
         deviceInspectPlanEntity.setUpdateTime(new Date());
         deviceInspectPlanEntity.setInspectUser(inspectUser);
         if (status == 2) {