Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount

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

@@ -98,7 +98,6 @@
             <when test="targetStatus == 7">`actual_start_date` = now()</when>
             <when test="targetStatus == 3">`actual_end_date` = now()</when>
         </choose>
-
         where id = #{id} and `status` = #{conditionStatus}
     </update>
 
@@ -503,7 +502,7 @@
             <if test="code != null">
                 and v3.code = #{code}
             </if>
-            and v1.book_user != -2
+            and v1.book_user != -2 and book_end_date &gt;= now()
         </where>
         group by v1.id
         order by create_time DESC