修改提前还车逻辑

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleBookRecordQueryVo.java

@@ -18,6 +18,11 @@ public class VehicleBookRecordQueryVo extends PageParam {
      */
     private String numberPlate;
 
+    /**
+     * 车牌和车辆编号的关键字
+     */
+    private String keywords;
+
     /**
      * 所属分支机构（id）
      */

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

@@ -478,6 +478,9 @@
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
+            <if test="keywords != null and keywords != ''">
+                and v3.code like concat("%", #{keywords},"%") or  v3.number_plate like concat("%", #{keywords},"%")
+            </if>
             <if test="companyIds != null and companyIds.size > 0">
                 and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">