后台功能优化，车辆新加托管人筛选字段

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

@@ -88,6 +88,8 @@
         LEFT JOIN branch_company bc1 ON v.expect_destination_branch_company_id = bc1.id
         -- 所属分公司
         LEFT JOIN branch_company bc2 ON v.subordinate_branch = bc2.id
+        LEFT JOIN vehicle_book_record v2 on v2.vehicle_id = v.id
+        LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         where
         v.is_del=0
         <if test="mRangeDateEnd !=null">
@@ -126,9 +128,15 @@
         <if test="code !=null">
             and v.code = #{code}
         </if>
-        <if test="status !=null">
+        <if test="status !=null and status != 6 and status != 7">
             and v.status = #{status}
         </if>
+        <if test="status !=null and status == 6">
+            and  v3.id is not NULL and v2.book_type = 3
+        </if>
+        <if test="status !=null and status == 7">
+            and  v3.id is not NULL and v2.book_type = 6
+        </if>
         <if test="numberPlate !=null and numberPlate != ''">
             and v.number_plate like concat('%',#{numberPlate},'%')
         </if>