From 0fa435b51ce67f017de99665292c378050c24113 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Wed, 22 Nov 2023 12:52:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E4=B8=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=88=B0=E6=8A=A5=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/op/device/service/impl/DevicePDAServiceImpl.java | 9 +++++++--
 .../com/op/device/service/impl/EquOrderServiceImpl.java  | 9 +++++++--
 2 files changed, 14 insertions(+), 4 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 39f9bdfc..89c93961 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
@@ -186,6 +186,11 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         }
 
         boolean hasError = false;
+        boolean maintenanceFlag = false;
+
+        if (equOrder.getPlanType().equals("maintenance")) {
+            maintenanceFlag = true;
+        }
 
         List<EquOrderDetail> detailList = equOrder.getDetailList();
         for (EquOrderDetail detail : detailList) {
@@ -256,7 +261,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         }
 
         // 报修信息
-        if (checkRepair && hasError ) {
+        if (checkRepair && hasError && !maintenanceFlag) {
             // 获取故障报修流水号
             EquRepairOrder equRepairOrder = new EquRepairOrder();
             String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
@@ -308,7 +313,7 @@ public class DevicePDAServiceImpl implements IDevicePDAService {
         }
 
         // 保养逻辑
-        if (equOrder.getPlanType().equals("maintenance")) {
+        if (maintenanceFlag) {
             // 设置结束时间
             equOrder.setOrderEnd(DateUtils.getNowDate());
             //上传附件
diff --git a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
index ec503844..70837bb8 100644
--- a/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
+++ b/op-modules/op-device/src/main/java/com/op/device/service/impl/EquOrderServiceImpl.java
@@ -196,6 +196,11 @@ public class EquOrderServiceImpl implements IEquOrderService {
         }
 
         boolean hasError = false;
+        boolean maintenanceFlag = false;
+
+        if (equOrder.getPlanType().equals("maintenance")) {
+            maintenanceFlag = true;
+        }
 
         List<EquOrderDetail> detailList = equOrder.getDetailList();
         for (EquOrderDetail detail : detailList) {
@@ -264,7 +269,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
         }
 
         // 报修信息
-        if (checkRepair && hasError) {
+        if (checkRepair && hasError && !maintenanceFlag) {
             // 获取故障报修流水号
             EquRepairOrder equRepairOrder = new EquRepairOrder();
             String serialNum = String.format("%03d", equRepairOrderMapper.selectOrderCodeSerialNumber());
@@ -318,7 +323,7 @@ public class EquOrderServiceImpl implements IEquOrderService {
         }
 
         // 保养逻辑
-        if (equOrder.getPlanType().equals("maintenance")) {
+        if (maintenanceFlag) {
             // 用时
             if (equOrder.getOrderStart() != null) {
                 long diffSeconds = (equOrder.getOrderEnd().getTime() - equOrder.getOrderStart().getTime()) / 60000;