Merge remote-tracking branch 'origin/master'

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

@@ -529,13 +529,13 @@
             <if test="code != null">
                 and v3.code = #{code}
             </if>
-            <!--增加时间限制，未审核的小于当前时间的不显示-->
+            <!--增加时间限制，未审核的结束时间小于当前时间的不显示-->
             <if test="flag == true and status == 1">
                 and book_end_date &gt;= now()
             </if>
-            <!--增加时间限制，已审核的未出车小于当前时间的不显示， 已出车的结束时间延后两天小于当前时间的不显示-->
-            <if test="flag == true and (status == 3 or status == 5 or status == 2)">
-                and ( (v4.id IS NOT NULL and DATE_ADD(v1.book_end_date,INTERVAL '2' DAY) >= now())  OR (v4.id IS NULL AND v1.book_end_date &gt;= now()))
+            <!--增加时间限制，已审核的未出车结束时间小于当前时间的不显示-->
+            <if test="flag == true and (status == 3 or status == 2)">
+                and v4.id IS NULL AND v1.book_end_date &gt;= now()
             </if>
             <if test="flag == true">
                 and v1.book_user != -2