From 1b5a723592ea63e5eec0bdeef7855b9c40e9df71 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 七月 2025 17:46:35 +0800
Subject: [PATCH] art:三保-设计修改

---
 lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml |   33 +++++++++++++++++++++++++++++++--
 1 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
index f7e323a..ffe7f6b 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml
@@ -3,10 +3,39 @@
 <mapper namespace="org.jeecg.modules.eam.mapper.EamEquipmentMapper">
 
     <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamEquipment">
-        select e.*, ext.repair_status, ext.maintenance_status
+        select e.*,
+               ext.maintenance_status,
+               ext.repair_status,
+               ext.latest_second_maintenance,
+               ext.next_second_maintenance,
+               ext.latest_third_maintenance,
+               ext.next_third_maintenance,
+               ext.technology_status,
+               ext.third_maintenance_period,
+               ext.technology_check_period,
+               ext.latest_technology_check,
+               ext.next_technology_check
         from eam_equipment e
         left join eam_equipment_extend ext
         on e.id = ext.id
         ${ew.customSqlSegment}
     </select>
-</mapper>
\ No newline at end of file
+    <select id="queryList" resultType="org.jeecg.modules.eam.entity.EamEquipment">
+        select e.*,
+               ext.maintenance_status,
+               ext.repair_status,
+               ext.latest_second_maintenance,
+               ext.next_second_maintenance,
+               ext.latest_third_maintenance,
+               ext.next_third_maintenance,
+               ext.technology_status,
+               ext.third_maintenance_period,
+               ext.technology_check_period,
+               ext.latest_technology_check,
+               ext.next_technology_check
+        from eam_equipment e
+                 left join eam_equipment_extend ext
+                           on e.id = ext.id
+            ${ew.customSqlSegment}
+    </select>
+</mapper>

--
Gitblit v1.9.3