From c2caf2ed6e327b5268c85cdc54021bb68dfb3732 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 5 Dec 2023 10:33:42 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=BF=90=E8=A1=8C=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=80=BB=E8=BE=91=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../op/device/service/impl/DevicePDAServiceImpl.java   | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 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 3d1f7da5..da3e2025 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
@@ -453,7 +453,6 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
 
     /**
      * 开始保养任务
-     * TODO 修改设备状态
      *
      * @param pdadto
      * @return
@@ -473,7 +472,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         String operationType;
         // 停机保养
         if (pdadto.getShutDown().equals("1")){
-            // 更改设备状态为停机
+            // 更改设备状态为保养中
             equ.setStatus("0");
             equOrderMapper.updateEquipmentStatus(equ);
             operationType = "off";
@@ -844,6 +843,13 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
     private void updateOperationRecord(String equipmentCode,String operationType,String type) {
         // 设备最后一条运行记录
         EquOperationRecord lastRecord = equOperationRecordMapper.selectLastOperationRecordByEquipmentCode(equipmentCode);
+        if (lastRecord.getMaintenanceType() != null) {
+            if (!lastRecord.getMaintenanceType().isEmpty()) {
+                if (lastRecord.getMaintenanceType().equals("repair")) {
+                    return;
+                }
+            }
+        }
         lastRecord.setEndTime(DateUtils.getNowDate());
         lastRecord.setUpdateBy(SecurityContextHolder.getUserName());
         // 更新运行记录