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