From 345910f457b046082aa2a79e8f5ce9049d9ec326 Mon Sep 17 00:00:00 2001
From: wws <18630710203@163.com>
Date: Tue, 5 Dec 2023 15:49:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=9D=E5=85=BB=E5=B7=A5=E5=8D=95=E7=8A=B6?=
=?UTF-8?q?=E6=80=81=E5=8F=98=E6=9B=B4=E3=80=81=E8=AE=A1=E5=88=92=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../java/com/op/device/service/impl/EquOrderServiceImpl.java | 4 +++-
.../src/main/resources/mapper/device/EquPlanMapper.xml | 1 +
2 files changed, 4 insertions(+), 1 deletion(-)
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 a559228e..5b87bf6e 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
@@ -256,7 +256,9 @@ public class EquOrderServiceImpl implements IEquOrderService {
}
// 更新工单信息
- equOrder.setOrderStatus("1"); // 状态为已完成
+ if (!equOrder.getPlanType().equals("maintenance")) {
+ equOrder.setOrderStatus("1"); // 状态为已完成
+ }
equOrder.setUpdateTime(DateUtils.getNowDate());
equOrder.setUpdateBy(SecurityContextHolder.getUserName());
equOrder.setPlanPerson(SecurityContextHolder.getUserName());
diff --git a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
index c05b9aba..34051cdc 100644
--- a/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
+++ b/op-modules/op-device/src/main/resources/mapper/device/EquPlanMapper.xml
@@ -87,6 +87,7 @@
and #{getLoopEndArrayEnd} >= CONVERT(date,plan_loop_end)
and del_flag = '0'
+ order by create_time desc