From 51ebb09a85d622cae75dc169b4c86723977d3756 Mon Sep 17 00:00:00 2001
From: yangkang <yangkang@xalxzn.com>
Date: 星期三, 13 九月 2023 15:39:48 +0800
Subject: [PATCH] 预测维护修改
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkPlanMapper.xml | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkPlanMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkPlanMapper.xml
index e5cb96e..f76295d 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkPlanMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkPlanMapper.xml
@@ -5,6 +5,11 @@
<select id="pagePredictiveWorkPlan" parameterType="Map" resultType="Map">
SELECT
t1.*,
+ t1.monitor_type monitorType,
+ t1.maintenance_method maintenanceMethod,
+ t1.assign_mode assignMode,
+ t1.equipment_id equipmentId,
+ t2.team_id teamId,
t2.num deviceNum,
t2.name deviceName,
t2.model deviceModel,
@@ -26,10 +31,13 @@
LEFT JOIN ( SELECT * FROM v_sys_dict WHERE dict_code = 'monitor_type' ) t7 ON t7.item_value = t1.monitor_type
WHERE t1.del_flag = 0 and t2.del_flag = 0
<if test="params.planNum != null and params.planNum != ''">
- and t1.num = concat('%',#{params.planNum},'%')
+ and t1.num like concat('%',#{params.planNum},'%')
+ </if>
+ <if test="params.status != null and params.status != ''">
+ and t1.status = #{params.status}
</if>
<if test="params.deviceName != null and params.deviceName != ''">
- and t2.name = concat('%',#{params.deviceName},'%')
+ and t2.name like concat('%',#{params.deviceName},'%')
</if>
ORDER BY t1.create_time desc
</select>
--
Gitblit v1.9.3