添加

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

@@ -591,18 +591,16 @@
     </select>
 
     <!--导出分公司停靠所有车辆-->
-    <select id="getAllVehicleInfo" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo">
-        SELECT
-        b1. NAME AS parkBranchCompanyName,
-        count(v1.id) as count
-        FROM
-        branch_company b1
-        LEFT JOIN vehicle v1 ON v1.park_branch_company_id = b1.id
-        WHERE
-        b1.is_del = 0
-        AND v1.is_del = 0
-        GROUP BY b1.`name`
-        order by b1.`name`
+    <select id="getAllVehicleInfo" resultType="com.xxfc.platform.vehicle.pojo.BranchCompanyVehicleCountVo" parameterType="Map">
+            select tmp.name as parkBranchCompanyName, COUNT(0) as count from (
+            select v1.number_plate, b.name from vehicle_book_record v
+            LEFT JOIN branch_company b on b.id = v.lift_company
+            LEFT JOIN vehicle v1 on v1.id = v.vehicle_id
+            where v.`status` != 4 and v.`status` != 6
+             and v.book_start_date &gt; #{startTime} and v.book_start_date &lt; #{endTime}
+            ORDER BY v.vehicle_id, v.book_start_date DESC
+            ) tmp
+            GROUP BY name
     </select>
 
     <select id="lockByCode" resultType="com.xxfc.platform.vehicle.entity.Vehicle"