Merge branch 'order_received_statistics' into dev

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderReceivedStatisticsBiz.java

@@ -154,6 +154,18 @@ public class OrderReceivedStatisticsBiz extends BaseBiz<OrderReceivedStatisticsM
                 dataCell.setCellStyle(cellStyle);
                 String sign = signs.get(cellIndex - 1);
                 List<OrderReceivedStatisticsVo> orderReceivedStatisticsVos = data.get(sign);
+                if (ReceivedStatisticsEnum.DAY.getWayCode() == statisticalWay){
+                    orderReceivedStatisticsVos.sort(Comparator.comparing(OrderReceivedStatisticsVo::getDate));
+                }
+
+                if (ReceivedStatisticsEnum.WEEK.getWayCode() == statisticalWay){
+                    orderReceivedStatisticsVos.sort(Comparator.comparing(OrderReceivedStatisticsVo::getWeekOfYear));
+                }
+
+                if (ReceivedStatisticsEnum.MONTH.getWayCode() == statisticalWay){
+                    orderReceivedStatisticsVos.sort(Comparator.comparing(OrderReceivedStatisticsVo::getMonth));
+
+                }
                 if (CollectionUtils.isEmpty(orderReceivedStatisticsVos) || i > orderReceivedStatisticsVos.size()) {
                     continue;
                 }