From 17638d2eba38eb0d9d98e899374b5db5d474b819 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期五, 22 十一月 2024 14:08:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 billion-main/src/main/resources/mapper/da/DaParamCollectionMapper.xml |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/billion-main/src/main/resources/mapper/da/DaParamCollectionMapper.xml b/billion-main/src/main/resources/mapper/da/DaParamCollectionMapper.xml
index 7a2d95b..68cb403 100644
--- a/billion-main/src/main/resources/mapper/da/DaParamCollectionMapper.xml
+++ b/billion-main/src/main/resources/mapper/da/DaParamCollectionMapper.xml
@@ -25,6 +25,8 @@
             <if test="locationCode != null  and locationCode != ''"> and location_code like concat('%', #{locationCode}, '%')</if>
             <if test="paramCode != null  and paramCode != ''"> and param_code = #{paramCode}</if>
             <if test="paramName != null  and paramName != ''"> and param_name like concat('%', #{paramName}, '%')</if>
+            <if test="startTime != null"> and collect_time BETWEEN #{startTime} and #{stopTime}</if>
+
         </where>
     </select>
     

--
Gitblit v1.9.3