From 2d8dafdddd85653371e463ee43f960f2366d9313 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期五, 27 十月 2023 15:51:16 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe
---
hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml
index 172cfdc..5c9c335 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml
@@ -88,6 +88,7 @@
t.check_type as checkType,
t.create_time as createTime,
t.device_id as deviceId,
+ sd1.dict_name as checkTypeName,
bd.big_device_name as bigDeviceName,
bd.big_device_model as bigDeviceModel,
bd.big_number as bigNumber,
@@ -98,17 +99,22 @@
from t_check_device t
left join t_big_device bd on t.device_id = bd.big_device_id
left join sys_dict sd on sd.dict_id = bd.big_type
+ left join sys_dict sd1 on sd1.dict_id = t.check_type
left join sys_users su on su.user_id = t.admin_user
<where>
<trim suffixOverrides=" AND ">
+ t.is_use = 1 AND
<if test="bigDeviceName !=null and bigDeviceName !=''">
- bd.big_device_name LIKE concat('%',#{bigDeviceName},'%')
+ bd.big_device_name LIKE concat('%',#{bigDeviceName},'%') AND
+ </if>
+ <if test="bigNumber !=null and bigNumber !=''">
+ bd.big_number LIKE concat('%',#{bigNumber},'%') AND
</if>
<if test="startTime !=null">
- t.check_time >= #{startTime}
+ t.check_time >= #{startTime} AND
</if>
<if test="endTime !=null">
- t.check_time <= #{endTime}
+ t.check_time <= #{endTime} AND
</if>
</trim>
</where>
--
Gitblit v1.9.3