From 8d136a0f92dcd31d77e18c30f9b1865db83b0f85 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 14:25:53 +0800
Subject: [PATCH] update
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
index 29210cf..901066a 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java
@@ -583,11 +583,12 @@
ids.add(-1);
}
ArrayList<Object> integers = new ArrayList<>();
- List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
int year = DateUtil.year(new Date());
+
for (int i = 0; i < 10; i++) {
integers.add(year-i);
}
+ List<Object> collect = integers.stream().sorted().collect(Collectors.toList());
// 年
ArrayList<Integer> years = new ArrayList<>();
ArrayList<Integer> yearsUser = new ArrayList<>();
@@ -601,6 +602,8 @@
map.put("yearData",years);
map.put("yearsUser",yearsUser);
// 月
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+
ArrayList<Integer> months = new ArrayList<>();
ArrayList<Integer> monthsUser = new ArrayList<>();
for (int i = 1; i <= 12; i++) {
--
Gitblit v1.7.1