用远程dev覆盖本地dev

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/VehicleDepartureLogMapper.java

@@ -15,9 +15,7 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
     VehicleDepartureLog selectLastByVehicleId(String vehicleId);
 
     List<VehicleDepartureLogVo> selectByVehicleId(String vehicleId);
-
     List<VehicleDepartureLog> selectByVehicle(String vehicleId);
-
     List<VehicleDepartureLogVo> selectVoAll(@Param("numberPlate") String numberPlate,
                                             @Param("code") Integer code,
                                             @Param("zoneId") Integer zoneId,
@@ -25,9 +23,7 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
                                             @Param("arrivalBranchCompanyId") Integer arrivalBranchCompanyId,
                                             @Param("use") String user,
                                             @Param("startTime") String startTime,
-                                            @Param("endTime") String endTime,
-                                            @Param("arrivalBranchCompanyId") Integer arrivalBranchCompanyId,
-                                            @Param("use") String user
+                                            @Param("endTime") String endTime
     );
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate,
@@ -38,15 +34,12 @@ public interface VehicleDepartureLogMapper extends BaseMapper<VehicleDepartureLo
                                                       @Param("use") String user,
                                                       @Param("startTime") String startTime,
                                                       @Param("endTime") String endTime,
-                                                      @Param("companyList") List<Integer> companyList,
-                                                      @Param("arrivalBranchCompanyId") Integer arrivalBranchCompanyId,
-                                                      @Param("use") String user);
+                                                      @Param("companyList") List<Integer> companyList);
 
     Integer selectMileageByVehicleId(String vehicleId);
 
     String selectDayByVehicleId(String vehicleId);
 
     VehicleDepartureLogVo selectByBookRecordId(Long bookRecordId);
-
     Integer selectAllDepartureLog(Map<String, Object> param);
 }

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

@@ -38,7 +38,7 @@
     </select>
     <select id="selectAllDepartureLog" resultType="java.lang.Integer" parameterType="Map">
         SELECT
-            count(*)
+        count(*)
         FROM
         vehicle_departure_log v1
         LEFT JOIN vehicle_book_record v2 on v1.book_record_id = v2.id
@@ -102,6 +102,7 @@
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
         LEFT JOIN branch_company bc ON vehicle_departure_log.departure_branch_company_id = bc.id
         LEFT JOIN branch_company bc1 ON vehicle_departure_log.arrival_branch_company_id = bc1.id
+        LEFT JOIN vehicle_book_record bc2 ON vehicle_departure_log.book_record_id = bc2.id
         <trim prefix="where">
             1=1
             <if test="numberPlate != null and numberPlate != ''">