From e5d0fe8cfdc5e171badfa22bac00b0e2e81ee6e6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期六, 07 六月 2025 16:17:59 +0800
Subject: [PATCH] art: 设备管理-设备维修-维修流程审批接口修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamRepairOrderMapper.xml | 14 ++++++++++++--
1 files changed, 12 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..d4f19ed 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,17 @@
<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="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