From ce1cfcb9b9176ddb1f47c9eb4cb2232b080bdbf9 Mon Sep 17 00:00:00 2001 From: lyh <925863403@qq.com> Date: 星期五, 25 七月 2025 14:54:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/mapper/xml/EamEquipmentMapper.xml | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 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 afac1e1..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 @@ -44,4 +44,20 @@ 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