From 848e5624f3a814763e81db5d79d8f0761c5bb4f1 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 01 二月 2024 10:25:40 +0800
Subject: [PATCH] 设备管理按照车间筛选和导出

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
index 511456e..8330d25 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/DailyMaintenanceOrderDetailMapper.xml
@@ -14,8 +14,11 @@
             t4.item_text as maintenanceMethodName,
             t3.maintenance_tool as maintenanceTool,
             t3.maintenance_require as maintenanceRequire,
-            concat(t6.code, '/', t6.name) as maintenanceCycleName,
-            t5.name as maintenanceSpecialtyName
+            t6.name as maintenanceCycleName,
+            t5.name as maintenanceSpecialtyName,
+            t1.daily_maintenance_order_id as dailyMaintenanceOrderId,
+            t1.maintenance_order_detail_uda1 as maintenanceOrderDetailUda1,
+            t1.maintenance_order_detail_uda2 as maintenanceOrderDetailUda2
         FROM
             mom_eam_daily_maintenance_order_detail t1
         LEFT JOIN mom_eam_maintenance_standard_detail t2 ON t1.maintenance_standard_detail_id = t2.id
@@ -27,6 +30,9 @@
         <if test="params.dailyMaintenanceOrderId != null and params.dailyMaintenanceOrderId != ''">
             and t1.daily_maintenance_order_id = #{params.dailyMaintenanceOrderId}
         </if>
+        <if test="sql != '' and sql != null">
+            ${sql}
+        </if>
         ORDER BY t1.create_time desc
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3