From d3e6773ef7cd0e11a444b41ec3da15938fabd85b Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 13:16:38 +0800
Subject: [PATCH] 产线管理
---
hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml | 5 ++++-
1 files changed, 4 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 5c9c335..2d8790b 100644
--- a/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml
+++ b/hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml
@@ -55,6 +55,7 @@
t.check_content as checkContent,
t.check_time as checkTime,
t.check_type as checkType,
+ sd1.dict_name as checkTypeName,
t.create_time as createTime,
t.device_id as deviceId,
bd.big_device_name as bigDeviceName,
@@ -67,6 +68,7 @@
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 t.id = #{id}
</select>
@@ -118,6 +120,7 @@
</if>
</trim>
</where>
+ order by t.create_time desc
</select>
<!--查询列表-->
@@ -229,7 +232,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