From ce41710ccaf1e841bd7bc0870d86bb30e0fa05da Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期一, 21 十月 2024 13:43:00 +0800
Subject: [PATCH] marge
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java | 34 +++++++++++++++++++++++++++++++++-
1 files changed, 33 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
index 6f1dfab..0c4df93 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/controller/TChargingOrderController.java
@@ -927,7 +927,39 @@
startDate = startDate.plusDays(1);
}
- tCharingUserMapVO.setMap(map);
+ tCharingUserMapVO.setMap(dateRangeStatistics);
+
+
+ List<Map<String,Object>> map1 = chargingOrderService.usersByQuery(statisticsQueryDto);
+
+
+
+
+ List<Map<String, Object>> dateRangeStatistics1 = new ArrayList<>();
+
+ // 遍历日期范围
+ while (!startDate.isAfter(endDate)) {
+ String formattedDate = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+ Map<String, Object> dailyStats = findMapWithDateValue(map1, formattedDate);
+
+ if (dailyStats != null) {
+ dateRangeStatistics1.add(dailyStats);
+ } else {
+ Map<String, Object> dateMap = new HashMap<>();
+ dateMap.put("time", formattedDate);
+ dateMap.put("counts", 0);
+ dateRangeStatistics1.add(dateMap);
+ }
+
+ // 移动到下一天
+ startDate = startDate.plusDays(1);
+ }
+
+ tCharingUserMapVO.setMap1(dateRangeStatistics1);
+
+
+
+
}
//用户标签
--
Gitblit v1.7.1