From ce3f55e4daea0640fd5065b8e655c3b177e79b9b Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 25 八月 2025 15:55:22 +0800
Subject: [PATCH] 设备管理首页列表接口
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 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 498f3ef..5ebb726 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,7 +3,7 @@
<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,f.process_instance_id as 'procInstId',
+ select wmo.*, e.equipment_code, e.equipment_name, e.equipment_model,e.factory_org_code,f.process_instance_id as 'procInstId',
f.process_definition_key,
f.process_definition_id,
f.process_instance_id
@@ -12,6 +12,18 @@
on wmo.equipment_id = e.id
left join flow_my_business f on f.data_id=wmo.id
${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>
<select id="findThirdMaintenanceBaseInfo" resultType="org.jeecg.modules.eam.request.EamThirdMaintenanceBaseResponse">
@@ -47,17 +59,6 @@
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