From cd45ac2fa0097de2fd9bf637fc5a23593be1aef0 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期二, 10 十月 2023 16:20:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 13 ++++++++++++-
1 files changed, 12 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..3a10b45 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
@@ -117,6 +117,14 @@
}
+ @PostMapping("/base/competition/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+ return paymentCompetitionService.queryByCode(code);
+ }
+
+
+
@PostMapping("/base/competition/getCompetitionsDetails")
public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
@@ -583,11 +591,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 +610,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