From cfe0b79fbea0fb1d7a5a796e71ada7d3b7812046 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 15 十二月 2025 22:31:33 +0800
Subject: [PATCH] feat: 企业微信发送微信小程序cetd

---
 ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml
index 43b5fb3..1762ebd 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml
@@ -64,8 +64,9 @@
     <select id="selectSegmentsByDateRange" resultMap="VehicleGpsSegmentMileageResult">
         <include refid="selectVehicleGpsSegmentMileageVo"/>
         WHERE vehicle_id = #{vehicleId}
-          AND segment_start_time &gt;= #{startDate}
-          AND segment_end_time &lt;= #{endDate}
+          AND segment_start_time &lt;= #{endDate}
+          AND segment_end_time &gt;= #{startDate}
+          AND segment_distance &gt;0
         ORDER BY segment_start_time
     </select>
     
@@ -154,4 +155,15 @@
     <select id="selectGpsCalculatedSegmentId" resultType="Long">
         SELECT segment_id FROM tb_vehicle_gps_calculated WHERE gps_id = #{gpsId} LIMIT 1
     </select>
+    
+    <!-- 鏌ヨ杞﹁締鍦ㄦ寚瀹氭椂闂翠箣鍓嶆渶鍚庝竴涓凡澶勭悊鐨凣PS鍧愭爣ID -->
+    <select id="selectLastCalculatedGpsId" resultType="Long">
+        SELECT c.gps_id 
+        FROM tb_vehicle_gps_calculated c
+        INNER JOIN tb_vehicle_gps g ON c.gps_id = g.gps_id
+        WHERE c.vehicle_id = #{vehicleId}
+          AND STR_TO_DATE(g.collect_time, '%Y-%m-%d %H:%i:%s') &lt; #{beforeTime}
+        ORDER BY STR_TO_DATE(g.collect_time, '%Y-%m-%d %H:%i:%s') DESC
+        LIMIT 1
+    </select>
 </mapper>

--
Gitblit v1.9.1