From e21119007e7d9899376c0dce4ed406a4c2901310 Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期一, 12 五月 2025 16:34:05 +0800
Subject: [PATCH] fix:新增订单-车牌号关联表。修复bug

---
 ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml |   22 +++++++++++++---------
 1 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
index a1c00c3..98a65fe 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
@@ -30,16 +30,20 @@
     <select id="selectVehicleGpsList" parameterType="VehicleGps" resultMap="VehicleGpsResult">
         <include refid="selectVehicleGpsVo"/>
         <where>  
-            <if test="vehicleId != null "> and g.vehicle_id = #{vehicleId}</if>
-            <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no like concat('%', #{vehicleNo}, '%')</if>
-            <if test="longitude != null "> and g.longitude = #{longitude}</if>
-            <if test="latitude != null "> and g.latitude = #{latitude}</if>
-            <if test="altitude != null "> and g.altitude = #{altitude}</if>
-            <if test="speed != null "> and g.speed = #{speed}</if>
-            <if test="direction != null "> and g.direction = #{direction}</if>
-            <if test="beginTime != null and beginTime != ''"> and g.collect_time &gt;= #{beginTime}</if>
-            <if test="endTime != null and endTime != ''"> and g.collect_time &lt;= #{endTime}</if>
+            <if test="vehicleNo != null  and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
+            <if test="longitude != null "> and longitude = #{longitude}</if>
+            <if test="latitude != null "> and latitude = #{latitude}</if>
+            <if test="speed != null "> and speed = #{speed}</if>
+            <if test="direction != null "> and direction = #{direction}</if>
+            <if test="collectTime != null "> and collect_time = #{collectTime}</if>
+            <if test="beginTime != null and beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+                AND date_format(collect_time,'%y%m%d') &gt;= date_format(#{beginTime},'%y%m%d')
+            </if>
+            <if test="endTime != null and endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+                AND date_format(collect_time,'%y%m%d') &lt;= date_format(#{endTime},'%y%m%d')
+            </if>
         </where>
+        order by collect_time desc
     </select>
     
     <select id="selectVehicleGpsById" parameterType="Long" resultMap="VehicleGpsResult">

--
Gitblit v1.9.1