From ff9dc3f8220dfeb9acddd2f86c28718001e70314 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 30 十月 2023 09:44:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
index bfa4030..03b3e57 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/MaintenanceThreeAcceptanceMapper.xml
@@ -4,14 +4,19 @@
<select id="getMaintenanceThreeAcceptanceList" parameterType="Map" resultType="Map">
SELECT
- t1.id AS id,
- t1.position,
- t1.content,
- t1.standard,
- t1.first_inspect as firstInspect,
- t1.second_inspect as secondInspect
+ t1.id,
+ t1.id as maintenanceOrderDetailId,
+ t1.daily_maintenance_order_id AS maintenanceOrderId,
+ t2.location AS position,
+ t3.name AS content,
+ t3.standard,
+ t4.first_inspect AS firstInspect,
+ t4.second_inspect AS secondInspect
FROM
- mom_eam_maintenance_three_acceptance t1
- WHERE t1.del_flag = '0' AND t1.maintenance_order_id = #{maintenanceOrderId}
+ mom_eam_daily_maintenance_order_detail t1
+ LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id
+ LEFT JOIN mom_eam_maintenance_project t3 ON t1.maintenance_project_id = t3.id
+ LEFT JOIN mom_eam_maintenance_three_acceptance t4 ON t1.id = t4.maintenance_order_detail_id
+ WHERE t1.del_flag = '0' AND t1.daily_maintenance_order_id = #{maintenanceOrderId}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3