From 9ca176b77f2572f433f44784fd24602aeb6d0e85 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期二, 10 六月 2025 17:26:36 +0800
Subject: [PATCH] 设备维修修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultInfoMapper.xml | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml | 1 +
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/RepairReportExportVo.java | 9 +++++----
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml | 1 +
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
index ff0ba3f..479147f 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EquipmentReportRepairMapper.xml
@@ -151,6 +151,7 @@
t2.num equipmentNum,
t2.name equipmentName,
t2.model equipmentModel,
+ t2.model,
t2.team_id teamId,
t2.specification specification,
t2.use_id useId,
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultInfoMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultInfoMapper.xml
index 516aa19..eadfcb7 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultInfoMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/FaultInfoMapper.xml
@@ -62,5 +62,7 @@
<if test="id != null and id != ''">
and t1.id = #{id}
</if>
+ order by t1.num desc
+
</select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml
index 41502af..8f96126 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/QuanlityConfirmMapper.xml
@@ -37,5 +37,6 @@
<if test="id != null and id != ''">
and t1.id = #{id}
</if>
+ order by t1.create_time desc
</select>
</mapper>
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/RepairReportExportVo.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/RepairReportExportVo.java
index ac61759..bb9f20b 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/RepairReportExportVo.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/vo/RepairReportExportVo.java
@@ -15,10 +15,7 @@
*/
@Data
public class RepairReportExportVo implements Serializable {
- @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15,orderNum = "0",dicCode = "specific_equipment")
- private String specificEquipment;
- @Excel(name = "鐘舵��", width = 15,orderNum = "1",dicCode = "equipment_report_repair_status")
- private String status;
+
@Excel(name = "鍗曟嵁鍙�", width = 15,orderNum = "2")
private String num;
/**璁惧缂栫爜*/
@@ -32,6 +29,10 @@
private String model;
@Excel(name = "浣跨敤閮ㄩ棬", width = 15,orderNum = "6",dicCode = "id",dictTable="sys_depart",dicText="depart_name")
private String useId;
+ @Excel(name = "鍏抽敭璁惧鏍囪瘑", width = 15,orderNum = "0",dicCode = "specific_equipment")
+ private String specificEquipment;
+ @Excel(name = "鐘舵��", width = 15,orderNum = "1",dicCode = "equipment_report_repair_status")
+ private String status;
@Excel(name = "鎶ヤ慨浜�", width = 15,orderNum = "7")
private String errUda2;
@Excel(name = "鏁呴殰鏃堕棿", width = 15,orderNum = "8",databaseFormat = "yyyy-MM-dd HH:mm:ss",exportFormat = "yyyy-MM-dd HH:mm:ss")
--
Gitblit v1.9.3