From 3ba2d33c27aea91c14bbf34e04e72f3d758a5105 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 22 十一月 2023 19:36:01 +0800
Subject: [PATCH] 11.21.2
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 36 +++++++++++++++++++++++++++++++++++-
1 files changed, 35 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 0dcb55c..9bdf0b2 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
@@ -186,10 +186,14 @@
// integers.add(2);
integers.add(3);
+ ArrayList<Integer> pays = new ArrayList<>();
+ pays.add(2);
+ pays.add(3);
+
return paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
.in("payType",integers)
.eq("appUserId",appUserId)
- .eq("payStatus",2));
+ .in("payStatus",pays));
}
@@ -627,6 +631,16 @@
wrapper.orderByDesc(Competition::getInsertTime);
Page<Competition> page = cttService.page(competitionPage, wrapper);
+ for (Competition record : page.getRecords()) {
+
+ // 查询当前赛事有多少人报名了
+ List<UserCompetition> competitionId = ucttService.list(new QueryWrapper<UserCompetition>()
+ .eq("competitionId", record.getId()));
+ // 报名数量
+ int temp = competitionId.size();
+ String value = String.valueOf(temp);
+ record.setCount(record.getApplicantsNumber()+"-"+value);
+ }
return page;
}catch (Exception e){
e.printStackTrace();
@@ -672,6 +686,16 @@
@PostMapping("/base/competition/add")
public void add(@RequestBody Competition competition){
try {
+ if (competition.getStartTime().after(new Date())){
+ competition.setStatus(1);
+ }
+ if (competition.getStartTime().before(new Date())){
+ if (competition.getEndTime().after(new Date())){
+ competition.setStatus(2);
+ }else{
+ competition.setStatus(3);
+ }
+ }
competition.setInsertTime(new Date());
cttService.save(competition);
}catch (Exception e){
@@ -682,6 +706,16 @@
@PostMapping("/base/competition/update")
public void update(@RequestBody Competition competition){
try {
+ if (competition.getStartTime().after(new Date())){
+ competition.setStatus(1);
+ }
+ if (competition.getStartTime().before(new Date())){
+ if (competition.getEndTime().after(new Date())){
+ competition.setStatus(2);
+ }else{
+ competition.setStatus(3);
+ }
+ }
cttService.updateById(competition);
}catch (Exception e){
e.printStackTrace();
--
Gitblit v1.7.1