From 3b90056cc6068e0586f65f7bd8a79d717ed3c69d Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期四, 12 六月 2025 14:57:12 +0800
Subject: [PATCH] 拆分停机列表排序规则调整，程序呼叫字典调增
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/AndonOrderServiceImpl.java | 1 +
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java | 2 ++
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeOperatorMapper.xml | 2 +-
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java
index 5321b7a..eeb9e90 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/AndonOrder.java
@@ -57,6 +57,7 @@
*/
@Excel(name = "瀹夌伅绫诲瀷", width = 15)
@ApiModelProperty(value = "瀹夌伅绫诲瀷")
+ @Dict(dicCode = "andon_type")
private String andonType;
/**
* 瀹夌伅浜�(鍛煎彨浜�)
@@ -111,6 +112,7 @@
*/
@Excel(name = "瀹夌伅鐘舵��;寰呭搷搴斻�佸緟澶勭悊銆佸凡瀹屾垚", width = 15)
@ApiModelProperty(value = "瀹夌伅鐘舵��;寰呭搷搴斻�佸緟澶勭悊銆佸凡瀹屾垚")
+ @Dict(dicCode = "order_status")
private String orderStatus;
/**
* 闂鎻忚堪
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeOperatorMapper.xml b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeOperatorMapper.xml
index db58e0e..581970f 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeOperatorMapper.xml
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/xml/MdcDowntimeOperatorMapper.xml
@@ -9,6 +9,6 @@
t2.downtime_description downtimeDescription
FROM mdc_downtime t1 LEFT JOIN mdc_downtime_reason t2 ON t1.reason_id = t2.id
${ew.customSqlSegment}
- ORDER BY t1.create_time DESC
+ ORDER BY t1.equipment_id DESC, t1.start_date ASC
</select>
</mapper>
\ No newline at end of file
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/AndonOrderServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/AndonOrderServiceImpl.java
index 813d192..93d0b4d 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/AndonOrderServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/AndonOrderServiceImpl.java
@@ -57,6 +57,7 @@
andonOrderInfo.setEquipmentId(equipmentId);
andonOrderInfo.setPlantName(equipmentIdToProductionIdMap != null && equipmentIdToProductionIdMap.containsKey(equipmentId) ? equipmentIdToProductionIdMap.get(equipmentId).getId() : null);
andonOrderInfo.setAndonType(StringPool.ONE);
+ andonOrderInfo.setOrderStatus(StringPool.ONE);
andonOrderInfo.setOperator(andonOrder.getOperator());
andonOrderInfo.setOperateTime(new Date());
andonOrderInfo.setResponder(userId);
--
Gitblit v1.9.3