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

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

@@ -69,7 +69,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
@@ -85,7 +84,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
@@ -119,9 +118,9 @@
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-<!--        <if test="subordinateBranch !=null">-->
-<!--            and v.subordinate_branch = #{subordinateBranch}-->
-<!--        </if>-->
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
@@ -161,18 +160,16 @@
             and ( v.park_branch_company_id = #{subordinateBranch})
         </if>
         <if test=" addrProvince !=null or addrCity !=null or zoneId !=null ">
-                <if test="addrProvince !=null">
-                    and bc.addr_province=#{addrProvince}
-                </if>
-                <if test="addrCity !=null">
-                   and  bc.addr_city=#{addrCity}
-                </if>
-                <if test="zoneId !=null">
-                   and  bc.zone_id=#{zoneId}
-                </if>
+            <if test="addrProvince !=null">
+                and bc.addr_province=#{addrProvince}
+            </if>
+            <if test="addrCity !=null">
+                and  bc.addr_city=#{addrCity}
+            </if>
+            <if test="zoneId !=null">
+                and  bc.zone_id=#{zoneId}
+            </if>
         </if>
-        GROUP BY v.id
-        order by v.code,v2.update_time DESC
         ) r ORDER BY r.parkBranchCompanyName
     </select>
 
@@ -211,7 +208,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
@@ -226,32 +222,32 @@
         -- 目的地分公司
         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 branch_company bc2 ON v.subordinate_branch = bc2.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
         <if test="companyList != null">
             and ( v.park_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
-                        #{companyId},
-                    </foreach>
-                </trim>
-                )
-                <!--or v.expect_destination_branch_company_id in (
-                <trim suffixOverrides=",">
-                    <foreach collection="companyList" item="companyId">
-                        #{companyId},
-                    </foreach>
-                </trim>
-                )-->
-    <!--            or v.subordinate_branch in (-->
-    <!--            <trim suffixOverrides=",">-->
-    <!--                <foreach collection="companyList" item="companyId">-->
-    <!--                    #{companyId},-->
-    <!--                </foreach>-->
-    <!--            </trim>-->
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )
+            <!--or v.expect_destination_branch_company_id in (
+            <trim suffixOverrides=",">
+                <foreach collection="companyList" item="companyId">
+                    #{companyId},
+                </foreach>
+            </trim>
+            )-->
+            <!--            or v.subordinate_branch in (-->
+            <!--            <trim suffixOverrides=",">-->
+            <!--                <foreach collection="companyList" item="companyId">-->
+            <!--                    #{companyId},-->
+            <!--                </foreach>-->
+            <!--            </trim>-->
             )
         </if>
         <if test="mRangeDateEnd !=null">
@@ -284,9 +280,9 @@
         <if test="vin !=null and vin != ''">
             and v.vin = #{vin}
         </if>
-<!--        <if test="subordinateBranch !=null">-->
-<!--            and v.subordinate_branch = #{subordinateBranch}-->
-<!--        </if>-->
+        <!--        <if test="subordinateBranch !=null">-->
+        <!--            and v.subordinate_branch = #{subordinateBranch}-->
+        <!--        </if>-->
         <if test="code !=null">
             and v.code = #{code}
         </if>
@@ -336,8 +332,6 @@
                 and  bc.zone_id=#{zoneId}
             </if>
         </if>
-        GROUP BY v.id
-        order by v.code,v2.update_time DESC
         ) r ORDER BY r.parkBranchCompanyName
     </select>