From 31ce6be2d56798d9509e6d90335999064351f7f3 Mon Sep 17 00:00:00 2001 From: luodangjia <luodangjia> Date: 星期二, 10 十二月 2024 16:06:26 +0800 Subject: [PATCH] 12.10 --- DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java index 3998f97..2880e76 100644 --- a/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java +++ b/DispatchOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/DriverServiceImpl.java @@ -143,6 +143,8 @@ return ResultUtil.success(); } + @Autowired + private IOrderTransferService orderTransferService; /** * 获取改派司机列表 @@ -166,6 +168,12 @@ list = driverMapper.queryReassignDriverCrossCity(companyId, orderCrossCity.getServerCarModelId(), orderCrossCity.getLineId(), lineShiftDriver.getLineShiftId(), orderCrossCity.getTravelTime(), orderCrossCity.getPeopleNumber()); } + if(reassign.getOrderType() == 7){//专车 + OrderTransferCar orderPrivateCar = orderTransferService.selectById(reassign.getOrderId()); + list = driverMapper.queryReassignOrderTransferCar(companyId, orderPrivateCar.getServerCarModelId()); + } + + for(int i = 0; i < list.size(); i++){ if(Integer.valueOf(list.get(i).get("id").toString()).compareTo(reassign.getOriginalDriverId()) == 0){ list.remove(i); -- Gitblit v1.7.1