From eec65dea6c89eab2737da676a1945c4de7c8c276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com>
Date: Mon, 21 Aug 2023 15:06:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/glxp/api/common/req/UpdateRequest.java       | 1 +
 .../glxp/api/controller/inv/DeviceInspectPlanController.java   | 2 +-
 .../com/glxp/api/service/inv/DeviceInspectPlanService.java     | 2 +-
 .../api/service/inv/impl/DeviceInspectPlanServiceImpl.java     | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

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) {