添加根据预定记录ID获取出行记录接口

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

@@ -85,7 +85,7 @@
         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_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1),
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         where
         v.is_del=0
@@ -171,8 +171,6 @@
                    and  bc.zone_id=#{zoneId}
                 </if>
         </if>
-        GROUP BY v.id
-        order by v2.update_time DESC
         ) r ORDER BY r.parkBranchCompanyName
     </select>
 
@@ -211,7 +209,6 @@
         v.receive_time,
         v.update_time,
         v.model_id,
-        MAX(v2.update_time),
         v.mileage_last_update as mileage
         <if test=" yearMonthAndParam !=null ">
             ,vbi.booked_date
@@ -227,7 +224,7 @@
         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_book_record v2 on v2.id = (select id from vehicle_book_record where vehicle_id = v.id order by update_time DESC LIMIT 1),
         LEFT JOIN vehicle_departure_log v3 on v2.id = v3.book_record_id
         where
         v.is_del=0
@@ -336,8 +333,6 @@
                 and  bc.zone_id=#{zoneId}
             </if>
         </if>
-        GROUP BY v.id
-        order by v2.update_time DESC
         ) r ORDER BY r.parkBranchCompanyName
     </select>