123

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java

@@ -236,8 +236,8 @@ public class VehicleActiveService {
             //兼容错误还车流程，先查询,是否有其他出行记录
             boolean flag = true;
             VehicleDepartureLog departureLog = departureLogVo.getVehicleDeparture(departureLogVo);
-            List<VehicleDepartureLogVo> list = vehicleDepartureLogMapper.selectByVehicleId(arrivalVo.getVehicleId());
-            for(VehicleDepartureLogVo vehicleDepartureLogVo : list) {
+            List<VehicleDepartureLog> list = vehicleDepartureLogMapper.selectByVehicle(arrivalVo.getVehicleId());
+            for(VehicleDepartureLog vehicleDepartureLogVo : list) {
                 if(vehicleDepartureLogVo.getState() != 1 && departureLogVo.getId() > departureLog.getId()) { //后面还有未收车的记录
                     flag = false;
                 }

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

@@ -13,7 +13,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("time") String time);
 
     List<VehicleDepartureLogVo> selectVoAllNotAllData(@Param("numberPlate") String numberPlate, @Param("time") String time, @Param("companyList") List<Integer> companyList);

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

@@ -17,6 +17,13 @@
         order by create_time desc
     </select>
 
+    <select id="selectByVehicle" parameterType="java.lang.String" resultType="com.xxfc.platform.vehicle.entity.VehicleDepartureLog">
+        select vehicle_departure_log.*,vehicle.number_plate
+        from vehicle_departure_log
+        where vehicle_id = #{vehicleId}
+        order by create_time desc
+    </select>
+
     <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
         select vehicle_departure_log.*
         from vehicle_departure_log