|
@@ -484,13 +484,14 @@ public class GatekeeperOrderService {
|
|
|
|
|
|
|
|
//查询门卫订单
|
|
//查询门卫订单
|
|
|
List<KwtGatekeeperWaybillOrder> orderList = gatekeeperWaybillOrderRepository.list(wrapper);
|
|
List<KwtGatekeeperWaybillOrder> orderList = gatekeeperWaybillOrderRepository.list(wrapper);
|
|
|
|
|
+ log.info("查询门卫订单, size:{}", orderList.size());
|
|
|
if (CollectionUtils.isEmpty(orderList)) {
|
|
if (CollectionUtils.isEmpty(orderList)) {
|
|
|
log.info("当前无门卫统计记录,统计结果为空");
|
|
log.info("当前无门卫统计记录,统计结果为空");
|
|
|
resp.setOrderStatusStatistics(buildDefaultStatusStatistics());
|
|
resp.setOrderStatusStatistics(buildDefaultStatusStatistics());
|
|
|
return resp;
|
|
return resp;
|
|
|
}
|
|
}
|
|
|
List<GatekeeperOrderResp> gatekeeperOrderPageResult = getGatekeeperOrderPageResult(orderList);
|
|
List<GatekeeperOrderResp> gatekeeperOrderPageResult = getGatekeeperOrderPageResult(orderList);
|
|
|
- log.info("统计查询门卫订单数据:{}, size:{}", JSON.toJSONString(gatekeeperOrderPageResult), gatekeeperOrderPageResult.size());
|
|
|
|
|
|
|
+ log.info("统计查询门卫订单数据, size:{}", gatekeeperOrderPageResult.size());
|
|
|
resp.setOrderStatusStatistics(calculateStatusStatistics(gatekeeperOrderPageResult));
|
|
resp.setOrderStatusStatistics(calculateStatusStatistics(gatekeeperOrderPageResult));
|
|
|
return resp;
|
|
return resp;
|
|
|
|
|
|
|
@@ -556,7 +557,7 @@ public class GatekeeperOrderService {
|
|
|
// 进行状态聚合
|
|
// 进行状态聚合
|
|
|
List<StatisticsWaybillResp.OrderBillStatusStatistics> aggregatedList = aggregateRules.entrySet().stream()
|
|
List<StatisticsWaybillResp.OrderBillStatusStatistics> aggregatedList = aggregateRules.entrySet().stream()
|
|
|
.map(rule -> {
|
|
.map(rule -> {
|
|
|
- String[] aggregateInfo = rule. getKey();
|
|
|
|
|
|
|
+ String[] aggregateInfo = rule.getKey();
|
|
|
List<String> originalStatuses = rule.getValue();
|
|
List<String> originalStatuses = rule.getValue();
|
|
|
long totalNum = 0;
|
|
long totalNum = 0;
|
|
|
|
|
|