From bdec8b24b78a6f52d21fff2cc8dfab847304dacc Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 03 四月 2025 11:46:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml
index fa971d4..d1e8ff0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml
@@ -2,4 +2,33 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.eam.mapper.EamMaintenanceStandardMapper">
-</mapper>
\ No newline at end of file
+ <select id="queryListBykeywordAndCategory" resultType="org.jeecg.modules.eam.entity.EamMaintenanceStandard">
+ SELECT
+ e.equipment_code+ '[' + e.equipment_name+ ']' AS 'equipmentText',
+ m.id,
+ m.standard_code,
+ m.standard_name,
+ m.maintenance_period,
+ m.equipment_id
+ FROM
+ eam_maintenance_standard m -- 鍏堣繃婊よ澶囪〃锛屽噺灏� JOIN 閲�
+ INNER JOIN (
+ SELECT
+ id,
+ eam_equipment.equipment_code as equipment_code,
+ eam_equipment.equipment_name as equipment_name,
+ org_id
+ FROM
+ eam_equipment
+ WHERE
+ del_flag = 0
+ AND ( equipment_code LIKE CONCAT ( #{ keyword }, '%' ) -- 鍙虫ā绯婂埄鐢ㄧ储寮�
+ OR equipment_name LIKE CONCAT ( #{ keyword }, '%' ) )
+ ) e ON m.equipment_id = e.id
+ WHERE
+ m.del_flag = 0
+ AND m.standard_status= 'NORMAL'
+ AND m.maintenance_category = #{maintenanceCategory}
+ AND EXISTS ( SELECT 1 FROM mdc_user_production t WHERE t.user_id = #{ userId } AND t.pro_id = e.org_id );
+ </select>
+</mapper>
--
Gitblit v1.9.3