From 07d470e55405cbfab1a7d38eeeb8907e741401df Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 14 一月 2025 20:13:36 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/qijisheng
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
index e3d535c..cc1c029 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/OrderController.java
@@ -301,8 +301,12 @@
.orderByAsc(Order::getCreateTime));
- Map<String, List<Order>> map = orderList.stream().collect(Collectors.groupingBy(item -> item.getCreateTime()
- .format(DateTimeFormatter.ofPattern("yyyy-MM-dd"))));
+ Map<String, List<Order>> map = orderList.stream()
+ .collect(Collectors.groupingBy(
+ item -> item.getCreateTime().format(DateTimeFormatter.ofPattern("yyyy-MM-dd")),
+ TreeMap::new, // 使用 TreeMap 按键排序
+ Collectors.toList()
+ ));
List<OrderStatisticsDetail> orderStatisticsDetails = new ArrayList<>();
map.forEach((key, value) -> {
--
Gitblit v1.7.1