From 27e6bc3df3e39e0d0b147b155a89ad6837ea972b Mon Sep 17 00:00:00 2001
From: cjl <909710561@qq.com>
Date: Mon, 06 Jan 2025 09:19:24 +0800
Subject: [PATCH] Merge branch 'cjl' into dev

---
 screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml b/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
index 9ec731e..2186ac9 100644
--- a/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
+++ b/screen-api/src/main/resources/mapper/SecondCruiserSortMapper.xml
@@ -13,7 +13,10 @@
 
     <select id="getSort" resultType="com.moral.api.entity.SecondCruiserSort">
         select road,avg(value) as "avg",time,mac from second_cruiser_sort
-        where mac =#{mac} and time BETWEEN #{startTime} and #{endTime} GROUP BY road ORDER BY avg DESC
+        where mac =#{mac}
+        AND `time` <![CDATA[>=]]> #{startTime}
+        AND `time` <![CDATA[<]]> #{endTime}
+        GROUP BY road ORDER BY avg DESC
 
     </select>
 

--
Gitblit v1.8.0