出行列表添加出车时间和还车时间筛选

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleDepartureLogMapper.xml

@@ -102,15 +102,10 @@
             </if>
             <if test="startTime != null and startTime != ''">
                 and
-                vehicle_departure_log.departure_time &lt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{startTime}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.departure_time is null
-
+                vehicle_departure_log.departure_time &gt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
             </if>
             <if test="endTime != null and endTime != ''">
-                and  vehicle_departure_log.arrival_time >=  str_to_date(#{endTime}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{endTime}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
+                and  vehicle_departure_log.arrival_time &gt;=  str_to_date(#{endTime}, '%Y-%m-%d %H')
             </if>
             <if test="code!=null">
                and  vehicle.code=#{code}
@@ -157,17 +152,17 @@
                 )
                 )
             </if>
-            <if test="time != null and time != ''">
-                and  (vehicle_departure_log.arrival_time >=  str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
-                or vehicle_departure_log.arrival_time is null
-                )
+            <if test="startTime != null and startTime != ''">
                 and
-                (
-                vehicle_departure_log.departure_time  &lt;= str_to_date(#{time}, '%Y-%m-%d %H')
-                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{time}, '%Y-%m-%d %H'))
+                vehicle_departure_log.departure_time &lt;= str_to_date(#{startTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.departure_time)=TO_DAYS(str_to_date(#{startTime}, '%Y-%m-%d %H'))
                 or vehicle_departure_log.departure_time is null
-                )
+
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and  vehicle_departure_log.arrival_time >=  str_to_date(#{endTime}, '%Y-%m-%d %H')
+                or TO_DAYS(vehicle_departure_log.arrival_time)=TO_DAYS(str_to_date(#{endTime}, '%Y-%m-%d %H'))
+                or vehicle_departure_log.arrival_time is null
             </if>
             <if test="code!=null">
                 and  vehicle.code=#{code}