From 07ad62ce0edbd32eb0b690e099c5f7091d269cd0 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期三, 09 四月 2025 16:38:09 +0800
Subject: [PATCH] 维修工单查询条件修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml | 5 ++++-
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java | 5 +++++
2 files changed, 9 insertions(+), 1 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 f68fb48..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
@@ -22,7 +22,10 @@
</otherwise>
</choose>
<if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''">
- AND t2.equipment_code 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 }),'%')
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
index 4fe288e..b468492 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/request/EamReportRepairQuery.java
@@ -22,6 +22,11 @@
private static final long serialVersionUID = -7111580122226167877L;
/**
+ * 璁惧缂栫爜
+ */
+ private String equipmentCode;
+
+ /**
* 寮�濮嬫椂闂�
*/
private String startTime;
--
Gitblit v1.9.3