From ddc0f14384619b9618f26a3f363f679833a68b3d Mon Sep 17 00:00:00 2001
From: yangbin <yangbin@qq.com>
Date: 星期三, 16 四月 2025 09:51:32 +0800
Subject: [PATCH] 自动化产线集成模块添加数据查询
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
index dfbd659..fb16bd6 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml
@@ -8,11 +8,11 @@
t2.equipment_name
FROM
eam_report_repair t1
- LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.equipment_code
+ LEFT JOIN eam_equipment t2 ON t1.equipment_id = t2.id
<where>
<choose>
<when test="equipmentIds != null and equipmentIds.size() > 0 ">
- AND t1.equipment_id IN
+ AND t2.equipment_code IN
<foreach collection="equipmentIds" item="equipmentId" index="index" open="(" close=")" separator=",">
{equipmentId}
</foreach>
@@ -22,7 +22,10 @@
</otherwise>
</choose>
<if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
+ AND t2.id = #{ eamReportRepair.equipmentId }
+ </if>
+ <if test="eamReportRepair.equipmentCode != null and eamReportRepair.equipmentCode != ''">
+ AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentCode }),'%')
</if>
<if test="eamReportRepair.equipmentName != null and eamReportRepair.equipmentName != ''">
AND t2.equipment_name = LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentName }),'%')
--
Gitblit v1.9.3