From 78c398d94f7bb4295ba3723d6919e4337ed2d243 Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 12 一月 2024 17:26:41 +0800
Subject: [PATCH] 维修履历导出

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

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
index baa6a45..b23c088 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml
@@ -16,7 +16,6 @@
         t1.preventive_measure preventiveMeasure,
         t1.fault_remove faultRemove,
         t1.fault_description faultDescription,
-        t1.fault_time faultTime,
         t1.photo photo,
         t1.is_stop isStop,
         t1.maintenance_method maintenanceMethod,
@@ -47,10 +46,12 @@
         report.accept_time acceptTime,
         report.err_uda3 errUda3,
         report.fault_hour faultHour,
+        report.fault_time faultTime,
         t2.num equipmentNum,
         t2.name equipmentName,
         t2.model equipmentModel,
         t2.specific_equipment specificEquipment,
+        t2.equipment_importance_id equipmentImportanceId,
         t3.depart_name departName,
         t4.name outsourcingUnitName,
         t5.realname responsibilityName,
@@ -96,11 +97,26 @@
         <if test="specificEquipment != null and specificEquipment != ''">
             and t2.specific_equipment = #{specificEquipment}
         </if>
+        <if test="equipmentImportanceId != null and  equipmentImportanceId != ''">
+            and t2. equipment_importance_id = #{equipmentImportanceId}
+        </if>
         <if test="teamId != null and teamId != ''">
             and t1.team_id = #{teamId}
         </if>
         <if test="repairOrderType != null and repairOrderType != ''">
-        and t1.repair_order_type = #{repairOrderType}
+            and t1.repair_order_type = #{repairOrderType}
+        </if>
+        <if test="faultStartTime != null">
+            and report.fault_time &gt;= #{faultStartTime}
+        </if>
+        <if test="faultEndTime != null">
+            and report.fault_time &lt;= #{faultEndTime}
+        </if>
+        <if test="createStartTime != null">
+            and t1.create_time &gt;= #{createStartTime}
+        </if>
+        <if test="createEndTime != null">
+            and t1.create_time &lt;= #{createEndTime}
         </if>
         order by t1.create_time desc
     </select>

--
Gitblit v1.9.3