From 32dd97cec5855a4d014a3286e0e7be8beb6dde51 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期一, 11 十二月 2023 14:10:13 +0800
Subject: [PATCH] 设备点检下拉列表
---
hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml b/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml
index d00ca11..e61c2ed 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,12 +99,16 @@
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},'%') AND
+ </if>
+ <if test="bigNumber !=null and bigNumber !=''">
+ bd.big_number LIKE concat('%',#{bigNumber},'%') AND
</if>
<if test="startTime !=null">
t.check_time >= #{startTime} AND
@@ -224,7 +229,7 @@
</delete>
<select id="deviceList" resultType="hashmap">
- select big_device_id as bigDeviceId,big_device_name as bigDeviceName from t_big_device
+ select big_device_id as bigDeviceId,concat(big_device_name,'-',big_device_model) as bigDeviceName from t_big_device
where is_use = 1 and company_id = #{companyId}
</select>
--
Gitblit v1.9.3