From 0369fbb67fefc80905c4f88ef36abf87d32f2559 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 07 四月 2025 13:05:28 +0800
Subject: [PATCH] 设备报修字段修改
---
lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java | 2 ++
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamReportRepairMapper.xml | 6 +++---
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
index 21b48f6..98764d0 100644
--- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
+++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/constant/BusinessCodeConst.java
@@ -13,6 +13,8 @@
String INSPECTION_ORDER_CODE_RULE = "EamInspectionOrder";
//鍛ㄤ繚缂栫爜瑙勫垯
String WEEK_MAINTENANCE_CODE_RULE = "WeekMaintenanceCodeRule";
+ // 缁翠慨宸ュ崟缂栫爜瑙勫垯
+ String REPAIR_ORDER_CODE_RULE = "RepairOrderCodeRule";
/**
* 澶囦欢璇疯喘鍗曠姸鎬� 1:宸插垱寤� 2:宸叉彁浜� 3:宸查�氳繃 4:宸查┏鍥� 5:宸插畬鎴�
*/
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..f68fb48 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,7 @@
</otherwise>
</choose>
<if test="eamReportRepair.equipmentId != null and eamReportRepair.equipmentId != ''">
- AND t1.equipment_id LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
+ AND t2.equipment_code LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentId }),'%')
</if>
<if test="eamReportRepair.equipmentName != null and eamReportRepair.equipmentName != ''">
AND t2.equipment_name = LIKE CONCAT(CONCAT('%',#{ eamReportRepair.equipmentName }),'%')
--
Gitblit v1.9.3