|
@@ -1167,9 +1167,15 @@ public class AcceptCarriageOrderService {
|
|
|
truck = fleetService.findTruck(collect);
|
|
truck = fleetService.findTruck(collect);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ //只展示待接单数据统计
|
|
|
|
|
+ List<DriverListVo> truckCount = logisticsOrderMapper.selectDriverCountById(driverParam);
|
|
|
|
|
+ Map<String, Integer> truckMap = new HashMap<>(Global.NUMERICAL_SIXTEEN);
|
|
|
|
|
+ truckCount.forEach(entity -> { truckMap.put(entity.getTruckNo(), entity.getCount());});
|
|
|
|
|
+
|
|
|
Map<String, String> dictData = commonService.getDictData(DictTypeEnum.TRUCK_TYPE.getType());
|
|
Map<String, String> dictData = commonService.getDictData(DictTypeEnum.TRUCK_TYPE.getType());
|
|
|
for (DriverListVo driverListVo : list) {
|
|
for (DriverListVo driverListVo : list) {
|
|
|
driverListVo.setStatusLabel(CarWaybillEnum.getName(driverListVo.getStatus()));
|
|
driverListVo.setStatusLabel(CarWaybillEnum.getName(driverListVo.getStatus()));
|
|
|
|
|
+ driverListVo.setCount(truckMap.get(driverListVo.getTruckNo()));
|
|
|
if (!ObjectUtils.isEmpty(truck)) {
|
|
if (!ObjectUtils.isEmpty(truck)) {
|
|
|
if (truck.get(driverListVo.getTruckNo()) != null) {
|
|
if (truck.get(driverListVo.getTruckNo()) != null) {
|
|
|
driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
|
|
driverListVo.setTransportStatus(truck.get(driverListVo.getTruckNo()) == null ? null : truck.get(driverListVo.getTruckNo()).getBusinessStatus());
|