From 453e36702a81f459295d30841bab00010f9a6ae6 Mon Sep 17 00:00:00 2001
From: 张晓波 <bingbo1993@126.com>
Date: 星期二, 12 十二月 2023 09:04:44 +0800
Subject: [PATCH] 撤销：人脸记录去掉token验证

---
 hd/pipe/mobile/src/main/resources/mapping/CheckDeviceMapper.xml |   10 +++++++++-
 1 files changed, 9 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..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>
@@ -88,6 +90,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 +101,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 &gt;= #{startTime} AND
@@ -113,6 +120,7 @@
                 </if>
             </trim>
         </where>
+        order by t.create_time desc
     </select>
 
     <!--查询列表-->
@@ -224,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