diff --git a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java index 43c3d79f6..39f9a8342 100644 --- a/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java +++ b/jsowell-pile/src/main/java/com/jsowell/pile/service/impl/OrderBasicInfoServiceImpl.java @@ -1580,25 +1580,7 @@ public class OrderBasicInfoServiceImpl implements IOrderBasicInfoService { resultList.add(vo); } - - // for (IndexOrderInfoVO indexOrderInfoVO : voList) { - // String orderCodes = indexOrderInfoVO.getOrderCodes(); - // // 获取到所有的订单号列表 - // if (StringUtils.isBlank(orderCodes)) { - // continue; - // } - // List orderCodeList = Arrays.asList(orderCodes.split(",")); - // // 查询对应数据 - // IndexOrderInfoVO detailInfo = orderBasicInfoMapper.getIndexOrderDetail(orderCodeList); - // if (detailInfo == null) { - // continue; - // } - // indexOrderInfoVO.setTotalSharpUsedElectricity(detailInfo.getTotalSharpUsedElectricity()); - // indexOrderInfoVO.setTotalPeakUsedElectricity(detailInfo.getTotalPeakUsedElectricity()); - // indexOrderInfoVO.setTotalFlatUsedElectricity(detailInfo.getTotalFlatUsedElectricity()); - // indexOrderInfoVO.setTotalValleyUsedElectricity(detailInfo.getTotalValleyUsedElectricity()); - // - // } + resultList = resultList.stream().sorted(Comparator.comparing(IndexOrderInfoVO::getDate)).collect(Collectors.toList()); return resultList; }