From 8904f9e6005e7e1f3cc06f415fdcde0033c32332 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期一, 21 七月 2025 20:33:53 +0800
Subject: [PATCH] art: 技术状态鉴定工单-生成逻辑优化
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 53 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..c6a96e2 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,61 @@
<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>
+ <select id="queryByEamCenterId" resultType="org.jeecg.modules.eam.entity.EamEquipment">
+ select * from
+ eam_equipment
+ where del_flag = 0
+ and factory_org_code =(select org_code from eam_base_factory where eam_base_factory.id=#{eamCenterId})
+ </select>
+ <select id="selectTechnicalEquipmentList" resultType="org.jeecg.modules.eam.entity.EamEquipment">
+ select e.*,
+ 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,
+ ext.technology_genarate_flag,
+ ext.third_maintenance_genarate_flag
+ from eam_equipment e
+ left join eam_equipment_extend ext
+ on e.id = ext.id
+ ${ew.customSqlSegment}
+ </select>
+</mapper>
--
Gitblit v1.9.3