From 9a12866758b1749953e1330c2e64d25d7a6a05b5 Mon Sep 17 00:00:00 2001
From: 李旭东 <woaiguo66@sina.com>
Date: 星期四, 09 十一月 2023 14:11:48 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml |   25 +++++++++++++++++++++++++
 1 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
index 2e9f97d..8814d92 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
@@ -1131,4 +1131,29 @@
       </if>
     </trim>
   </insert>
+
+  <select id="dataAIList" resultType="com.thhy.materials.modules.biz.helmet.entity.TDataAi">
+    select
+    sign_time as signTime,
+    box_name as boxName,
+    device_name as deviceName,
+    type_name as typeName,
+    `type` as `type`,
+    sign_avatar as signAvatar
+    from  t_data_ai where
+    1=1
+    <if test="strTime!=null and strTime!='' and endTime!='' and endTime!=null ">
+      and  sign_time between #{strTime} and #{endTime}
+    </if>
+    <if test="type!=null and type!='' ">
+      and `type` =#{type}
+    </if>
+    order by  sign_time desc
+  </select>
+  <select id="dataAIType" resultType="com.thhy.materials.modules.biz.helmet.entity.dto.TypeName">
+        select `type`,
+         type_name as typeName
+         from  t_data_ai_type
+         order by `type` asc
+  </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.3