From ba11a11662a027e89f3e86d063b3234aeeb76d83 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 22 八月 2025 17:22:56 +0800
Subject: [PATCH] 设备管理首页
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
index 92cc041..498f3ef 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml
@@ -3,10 +3,14 @@
<mapper namespace="org.jeecg.modules.eam.mapper.EamThirdMaintenanceOrderMapper">
<select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
- 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_third_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
+ left join flow_my_business f on f.data_id=wmo.id
${ew.customSqlSegment}
</select>
@@ -36,11 +40,24 @@
WHERE t1.id = #{id}
</select>
<select id="queryList" resultType="org.jeecg.modules.eam.dto.EamThirdMaintenanceOrderExport">
- select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted, e.equipment_code, e.equipment_name, e.equipment_model,f.factory_name
+ select wmo.*,FORMAT(CAST(wmo.maintenance_date AS DATE), 'yyyy骞碝M鏈坉d鏃�') AS maintenance_date_formatted,
+ e.equipment_code, e.equipment_name, e.equipment_model,e.equipment_category
+ ,f.factory_name
from eam_third_maintenance_order wmo
inner join eam_equipment e
on wmo.equipment_id = e.id
LEFT JOIN eam_base_factory f ON f.org_code = SUBSTRING ( e.factory_org_code , 1, 6 )
${ew.customSqlSegment}
</select>
+ <select id="queryAsList" resultType="org.jeecg.modules.eam.entity.EamThirdMaintenanceOrder">
+ 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_third_maintenance_order wmo
+ inner join eam_equipment e
+ on wmo.equipment_id = e.id
+ left join flow_my_business f on f.data_id=wmo.id
+ ${ew.customSqlSegment}
+ </select>
</mapper>
--
Gitblit v1.9.3