From 85e36a5016633748bbd76bb4ddaef49566a505d5 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 08 五月 2025 17:57:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 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 afe5ce8..b20669f 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,15 +14,18 @@
<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>
EXISTS ( SELECT 1 FROM mdc_user_production t3 WHERE t3.user_id = #{userId} AND t3.pro_id= t2.org_id )
</otherwise>
</choose>
+ <if test="eamRepairOrder.equipmentCode != null and eamRepairOrder.equipmentCode != ''">
+ AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentCode }),'%')
+ </if>
<if test="eamRepairOrder.equipmentId != null and eamRepairOrder.equipmentId != ''">
- AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentId }),'%')
+ AND t2.id = #{ eamRepairOrder.equipmentId }
</if>
<if test="eamRepairOrder.equipmentName != null and eamRepairOrder.equipmentName != ''">
AND t2.equipment_name LIKE CONCAT(CONCAT('%',#{ eamRepairOrder.equipmentName }),'%')
@@ -36,7 +39,10 @@
<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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3