From 653f9e275a6aac34cac04f01a8ab29b2aa00ec9f Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期五, 01 八月 2025 16:56:51 +0800
Subject: [PATCH] 班次利用率算法调整

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

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
index d76beae..a74a5ee 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml
@@ -14,7 +14,7 @@
                 <when test="equipmentIds != null and equipmentIds.size() > 0 ">
                     AND t2.equipment_code IN
                     <foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
-                        {equipmentId}
+                        #{equipmentId}
                     </foreach>
                 </when>
                 <otherwise>
@@ -39,7 +39,28 @@
             <if test="eamRepairOrder.repairCode != null and eamRepairOrder.repairCode != ''">
                 AND t1.repair_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.repairCode }),'%')
             </if>
+            <if test="eamRepairOrder.sparePartDescription != null and eamRepairOrder.sparePartDescription != ''">
+                AND t1.spare_part_description LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.sparePartDescription }),'%')
+            </if>
         </where>
-        ORDER BY t1.create_time
+        ORDER BY t1.create_time DESC
+    </select>
+
+    <select id="repairmanRanking" resultType="org.jeecg.modules.eam.vo.RepairmanRankingVO">
+        select t.repairer, COUNT(1) as repairNumber
+        from eam_repair_order t
+        where t.repair_status = 'COMPLETE'
+          and t.del_flag = 0
+          and t.actual_end_time &gt;= #{start}
+          and t.actual_end_time &lt; #{end}
+        group by t.repairer
+        order by repairNumber desc
+    </select>
+    <select id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamRepairOrder">
+        select wmo.*, e.equipment_code, e.equipment_name, e.installation_position
+        from eam_repair_order wmo
+        inner join eam_equipment e
+        on wmo.equipment_id = e.id
+        ${ew.customSqlSegment}
     </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3