|
|
@@ -2049,7 +2049,7 @@ public class WaybillOrderService {
|
|
|
.collect(Collectors.toMap(KwtLogisticsOrderAddress::getLOrderId, Function.identity(), (x, y) -> x));
|
|
|
|
|
|
// 6.门卫
|
|
|
- List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, param.getStartTime(), param.getEntTime());
|
|
|
+ List<KwtGatekeeperWaybillOrder> gatekeepers = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(param.getEntId(), lOrderIds, Global.ADDRESS_LOAD, param.getStartTime(), param.getEndTime());
|
|
|
if (CollectionUtils.isEmpty(gatekeepers)) {
|
|
|
return new ArrayList<>();
|
|
|
}
|
|
|
@@ -2407,7 +2407,7 @@ public class WaybillOrderService {
|
|
|
.collect(Collectors.toMap(KwtLogisticsOrder::getId, Function.identity(), (x, y) -> x));
|
|
|
|
|
|
// 3.门卫
|
|
|
- List<KwtGatekeeperWaybillOrder> gatekeepeSeconds = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, Global.ADDRESS_UNLOAD, param.getStartTime(), param.getEntTime());
|
|
|
+ List<KwtGatekeeperWaybillOrder> gatekeepeSeconds = gatekeeperWaybillOrderRepository.queryGatekeeperByWaybillOrders(mockEntIds, lOrderIds, Global.ADDRESS_UNLOAD, param.getStartTime(), param.getEndTime());
|
|
|
if (CollectionUtils.isEmpty(gatekeepeSeconds)) {
|
|
|
return Collections.emptyList();
|
|
|
}
|