From 979c7c817b2e7d2430ac447b10f943c12dac3b64 Mon Sep 17 00:00:00 2001
From: 叶松 <2217086471@qq.com>
Date: 星期四, 26 十月 2023 11:32:01 +0800
Subject: [PATCH] Merge branch 'master' of http://111.30.93.211:10101/r/supipe

---
 hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml |    3 +++
 1 files changed, 3 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 9690b58..94c0c00 100644
--- a/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
+++ b/hd/pipe/materialsManage/src/main/resources/mapping/THelmetDeviceMapper.xml
@@ -547,6 +547,9 @@
          sm_time as smTime
          from t_helmet_report where
         user_id=#{userId}
+      <if test="strTime!=null and strTime!='' and endTime!=null and endTime!='' ">
+        and sm_time between #{strTime} and #{endTime}
+      </if>
         order by sm_time desc
   </select>
 

--
Gitblit v1.9.3