From 91ecd91be9af6c6c05cc91f4d032b742d6c374a8 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 5 Dec 2023 10:42:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E6=9B=B4=E6=94=B9=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=8A=B6=E6=80=81BUG=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/service/impl/DevicePDAServiceImpl.java   | 10 ++++++----
 .../main/resources/mapper/device/EquOrderMapper.xml    |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
index da3e2025..f65d34f7 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/DevicePDAServiceImpl.java
@@ -331,7 +331,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
             // 创建设备对象用于更新设备状态
             Equipment equ = new Equipment();
             equ.setEquipmentCode(equOrder.getEquipmentCode());
-            // 更新设备状态为开机
+            // 更新设备状态为正常运行
             equ.setStatus("1");
             equOrderMapper.updateEquipmentStatus(equ);
             // 更新设备运行记录
@@ -472,13 +472,15 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         String operationType;
         // 停机保养
         if (pdadto.getShutDown().equals("1")){
-            // 更改设备状态为保养中
-            equ.setStatus("0");
-            equOrderMapper.updateEquipmentStatus(equ);
             operationType = "off";
         }else {
             operationType = "on";
         }
+
+        // 更改设备状态为保养中
+        equ.setStatus("3");
+        equOrderMapper.updateEquipmentStatus(equ);
+
         // 更新设备运行记录
         updateOperationRecord(order.getEquipmentCode(),operationType,"upkeep");
 
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
index ec811201..90549916 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquOrderMapper.xml
@@ -367,7 +367,7 @@
 
 	<update id="updateEquipmentStatus">
 		update base_equipment
-		set status = #{status}
+		set equipment_status = #{status}
 		where equipment_code = #{equipmentCode}
 		  and del_flag = '0'
 	</update>