From 4e8f5527259801d18b02f98d38bfe23eb2afc558 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 18 十月 2023 09:48:10 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
index 1e0ea12..9bfcbd9 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/DataStatisticsController.java
@@ -116,11 +116,10 @@
public Object getIncomeData(Integer operatorId,Integer storeId) {
// 报名课程查询query
RegisterOrderQuery query = new RegisterOrderQuery();
- // 充值记录查询query
+ // 充值记录查询query
RechargeRecordsQuery rechargeRecordsQuery = new RechargeRecordsQuery();
// 赛事活动查询query
CompetitionQuery competitionQuery = new CompetitionQuery();
-
// 会员支付查询query
IncomeQuery incomeQuery = new IncomeQuery();
// 场地预约记录查询query
@@ -275,7 +274,7 @@
int years = DateUtil.year(new Date());
for (int i = 0; i < 10; i++) {
integers1.add(years-i);
- }
+ }
List<Object> collect = integers1.stream().sorted().collect(Collectors.toList());
List<Object> objects1 = new ArrayList<>();
for (Object o : collect) {
--
Gitblit v1.7.1