From 1a2258c4eca2e7514b6096004fa1c3e0036b402b Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 14:04:24 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml
index 2754f9e..cc1c583 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/mapper/xml/PredictiveWorkOrderMapper.xml
@@ -49,6 +49,7 @@
select
t1.id id,
t1.num num,
+ t1.status status,
t1.item_id itemId,
t1.actual_start_time actualStartTime,
t1.actual_end_time actualEndTime,
@@ -57,11 +58,14 @@
t1.create_by createBy,
t1.create_time createTime,
t1.maintenance_user_id maintenanceUserId,
+ t1.recipient_user_id recipientUserId,
t2.monitor_type monitorType,
t2.num planNum,
+ t2.id workPlanId,
t2.team_id teamId,
t2.plan_version version,
t2.assign_mode assignMode,
+ t3.id equipmentId,
t3.num equipmentNum,
t3.name equipmentName,
t3.model model,
@@ -87,5 +91,14 @@
<if test="num != null and num != ''">
and t1.num like concat('%',#{num},'%')
</if>
+ <if test="status != null and status != ''">
+ and t1.status = #{status}
+ </if>
+ <if test="equipmentNum != null and equipmentNum != ''">
+ and t3.num like concat('%',#{equipmentNum},'%')
+ </if>
+ <if test="equipmentName != null and equipmentName != ''">
+ and t3.name like concat('%',#{equipmentName},'%')
+ </if>
</select>
</mapper>
--
Gitblit v1.9.3