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

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

@@ -20,7 +20,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
-import tk.mybatis.mapper.entity.Example;
 
 import java.util.*;
 
@@ -462,9 +461,7 @@ public class VehicleActiveService {
         if (bookRecordId == null) {
             return ObjectRestResponse.paramIsEmpty();
         }
-        Example example = new Example(VehicleDepartureLog.class);
-        example.createCriteria().andEqualTo("bookRecordId", bookRecordId);
-       VehicleDepartureLog vehicleDepartureLog = vehicleDepartureLogMapper.selectOneByExample(example);
+        VehicleDepartureLogVo vehicleDepartureLog = vehicleDepartureLogMapper.selectByBookRecordId(bookRecordId);
         if (vehicleDepartureLog == null) {
             return ObjectRestResponse.createFailedResult(ResCode.FIND_DATA_NOT_EXIST.getCode(), ResCode.FIND_DATA_NOT_EXIST.getDesc());
         }

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

@@ -29,8 +29,10 @@
     </select>
 
     <select id="selectByBookRecordId" parameterType="java.lang.Long" resultType="com.xxfc.platform.vehicle.pojo.VehicleDepartureLogVo">
-        select vehicle_departure_log.*
+        select vehicle_departure_log.*, bc.name as departureName,bc1.name as arrivalName,
         from vehicle_departure_log
+        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
         where vehicle_departure_log.book_record_id = #{id}
         order by create_time desc
     </select>