From d88b7402ecf5f6b3dd14636db5bcde3b847d8f0a Mon Sep 17 00:00:00 2001
From: hyingbo <1363390067@qq.com>
Date: 星期三, 28 五月 2025 17:48:23 +0800
Subject: [PATCH] 设备添加安装位置，调整设备利用率中开始时间加关机时间不等于24的问题
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml | 18 ++++++++++++++++--
1 files changed, 16 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..1f65d48 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,21 @@
<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 >= #{start}
+ and t.actual_end_time < #{end}
+ group by t.repairer
+ order by repairNumber desc
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3