From d61b21c50e62298f185ecafa8e0b22f7ee8c4973 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 21 八月 2025 18:13:17 +0800
Subject: [PATCH] 430报表接口与列表流程添加
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamThirdMaintenanceOrderMapper.xml | 10 ++++++++--
1 files changed, 8 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..e89ebba 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,7 +40,9 @@
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
--
Gitblit v1.9.3