From 86205f625e45bcdfb4335b672e0754d8a407847f Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期三, 16 四月 2025 11:40:43 +0800
Subject: [PATCH] art: 设备管理-周保-选择设备bug问题修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/EamMaintenanceStandardMapper.xml | 35 ++++++-----------------------------
1 files changed, 6 insertions(+), 29 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 d1e8ff0..68f0ef2 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
@@ -1,34 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<!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">
-
- <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 id="queryPageList" resultType="org.jeecg.modules.eam.entity.EamMaintenanceStandard">
+ select ems.*, e.equipment_code, e.equipment_name
+ from eam_maintenance_standard ems
+ inner join eam_equipment e
+ on ems.equipment_id = e.id
+ ${ew.customSqlSegment}
</select>
</mapper>
--
Gitblit v1.9.3