From 63a5530a85e6eaf7f8be733e87d32af2d16477a8 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期日, 07 四月 2024 13:39:02 +0800
Subject: [PATCH] 设备管理 报表打印修改

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/RepairOrderMapper.xml |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 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 87f5160..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
@@ -11,16 +11,11 @@
         t1.recipient_user_id recipientUserId,
         t1.report_repair_id reportRepairId,
         t1.project_maintenance_order_id projectMaintenanceOrderId,
-        t2.num equipmentNum,
-        t2.name equipmentName,
-        t2.model equipmentModel,
-        t2.specific_equipment specificEquipment,
         t1.fault_reason faultReason,
         t1.fault_phenomenon faultPhenomenon,
         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,
@@ -38,20 +33,48 @@
         t1.business_type businessType,
         t1.responsibility_id responsibilityId,
         t1.outsourcing_unit outsourcingUnit,
+        t1.actual_hour actualHour,
         t1.remark,
+        t1.repair_order_uda1 repairOrderUda1,
+        t1.repair_order_uda2 repairOrderUda2,
+        t1.repair_order_uda3 repairOrderUda3,
+        t1.repair_order_uda4 repairOrderUda4,
+        t1.repair_order_uda5 repairOrderUda5,
+        t1.spare_time spareTime,
+        t1.part_time partTime,
+        report.err_uda2 errUda2,
+        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,
         t6.name teamName
         from mom_eam_repair_order t1
+        left join(select * from mom_eam_equipment_report_repair where del_flag = 0 ) report on report.id = t1.report_repair_id
         left join(select * from mom_eam_equipment where del_flag = 0 and status = 1) t2 on t1.equipment_id= t2.id
         left join sys_depart t3 on t3.id = t1.depart_id
         left join mom_base_supplier t4 on t1.outsourcing_unit = t4.id
         left join sys_user t5 on t5.id = t1.responsibility_id
         left join mom_base_team t6 on t6.id=t1.team_id
         where t1.del_flag = 0
+        <if test="id != null and id != ''">
+            and t1.id = #{id}
+        </if>
         <if test="num != null and num != ''">
             and t1.num like concat('%',#{num},'%')
+        </if>
+        <if test="equipNums.size!=0">
+            and t2.num in
+            <foreach collection="equipNums" open="(" separator="," close=")" item="num">
+                #{num}
+            </foreach>
         </if>
         <if test="equipmentNum != null and equipmentNum != ''">
             and t2.num like concat('%',#{equipmentNum},'%')
@@ -62,6 +85,9 @@
         <if test="status != null and status != ''">
             and t1.status = #{status}
         </if>
+        <if test="repairOrderUda1 != null and repairOrderUda1 != ''">
+            and t1.repair_order_uda1 = #{repairOrderUda1}
+        </if>
         <if test="equipmentCategoryId != null and equipmentCategoryId != ''">
             and t2.equipment_category_id = #{equipmentCategoryId}
         </if>
@@ -71,7 +97,27 @@
         <if test="specificEquipment != null and specificEquipment != ''">
             and t2.specific_equipment = #{specificEquipment}
         </if>
-        and t1.repair_order_type = #{repairOrderType}
+        <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}
+        </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