修改代码

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/VehicleDepartureLog.java

@@ -2,8 +2,8 @@ package com.xxfc.platform.vehicle.entity;
 
 import lombok.Data;
 
-import java.util.Date;
 import javax.persistence.*;
+import java.util.Date;
 
 /**
  * 出车记录
@@ -82,5 +82,8 @@ public class VehicleDepartureLog {
 
     Integer state;
 
-
+    /**
+     * 预约记录id
+     */
+    Integer bookRecordId;
 }

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/VehicleDepartureVo.java

@@ -45,4 +45,9 @@ public class VehicleDepartureVo {
      */
     Integer expectArrivalBranchCompanyId;
 
+    /**
+     * 预约记录id
+     */
+    Integer bookRecordId;
+
 }

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

@@ -88,6 +88,7 @@ public class VehicleActiveService {
             departureLog.setCreateTime(new Date());
             departureLog.setMileageStart(departureVo.getMileage());
             departureLog.setState(VehicleDepartureState.DEPARTURE.getCode());
+            departureLog.setBookRecordId(departureVo.getBookRecordId());
             vehicleDepartureLogMapper.insert(departureLog);
 
             // 车辆活动日志

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

@@ -21,7 +21,7 @@
         select vehicle_departure_log.*,vehicle.number_plate
         from vehicle_departure_log
         left join vehicle on vehicle_departure_log.vehicle_id = vehicle.id
-        where book_record_id = #{id}
+        where vehicle_departure_log.book_record_id = #{id}
         order by create_time desc
     </select>