From 8918b2f8444db69be6887c9a0959d13e164bbddb Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 27 八月 2025 14:29:32 +0800
Subject: [PATCH] 设备二保定时服务开发，填充车间二保计划数据，三不放过批量导出接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml | 27 +++++++++++++++++++++++++--
1 files changed, 25 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
index 5034d04..f9aae1e 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamSecondMaintenanceOrderMapper.xml
@@ -3,10 +3,33 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamSecondMaintenanceOrderMapper">
<select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamSecondMaintenanceOrder">
- select wmo.*, e.equipment_code, e.equipment_name,e.equipment_model
+ SELECT
+ wmo.*,
+ e.equipment_code,
+ e.equipment_name,
+ e.equipment_model,
+ f.process_instance_id AS 'procInstId',
+ f.process_definition_key,
+ f.process_definition_id,
+ f.process_instance_id
+ FROM eam_second_maintenance_order wmo
+ INNER JOIN eam_equipment e ON wmo.equipment_id = e.id
+ LEFT JOIN (
+ SELECT
+ data_id,
+ MAX(id) AS max_id -- 鑾峰彇鏈�澶D
+ FROM flow_my_business
+ GROUP BY data_id
+ ) latest ON wmo.id = latest.data_id
+ LEFT JOIN flow_my_business f ON f.id = latest.max_id
+ ${ew.customSqlSegment}
+ </select>
+ <select id="queryList" resultType="org.jeecg.modules.eam.dto.EamSecondMaintenanceOrderExport">
+ select wmo.*,FORMAT(wmo.maintenance_date, 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted, e.equipment_code, e.equipment_name,e.equipment_model,f.factory_name
from eam_second_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
- ${ew.customSqlSegment}
+ LEFT JOIN eam_base_factory f ON f.org_code = SUBSTRING ( e.factory_org_code , 1, 6 )
+ ${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.3