diff --git a/src/main/java/com/glxp/api/common/req/UpdateRequest.java b/src/main/java/com/glxp/api/common/req/UpdateRequest.java index ff27f2e7..c956d9bf 100644 --- a/src/main/java/com/glxp/api/common/req/UpdateRequest.java +++ b/src/main/java/com/glxp/api/common/req/UpdateRequest.java @@ -49,4 +49,5 @@ public class UpdateRequest { private Date expectedTime; + private Integer planStatus; } diff --git a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java b/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java index c4f0d617..c2db0cb9 100644 --- a/src/main/java/com/glxp/api/controller/inv/DeviceInspectPlanController.java +++ b/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()); } /** diff --git a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java b/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java index 517340db..26ddf372 100644 --- a/src/main/java/com/glxp/api/service/inv/DeviceInspectPlanService.java +++ b/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); /** * 删除巡检计划 diff --git a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java b/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java index c543b46a..7623b5c4 100644 --- a/src/main/java/com/glxp/api/service/inv/impl/DeviceInspectPlanServiceImpl.java +++ b/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) {