From d4fbea2ac7f7c98ffd83480f8f2535ca92f3baea Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 29 十一月 2023 18:19:43 +0800
Subject: [PATCH] 11.29
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
index 9db64f7..3e96cfd 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java
@@ -286,11 +286,17 @@
Page<Competition> competitions = competitionClient.list(listQuery);
List<Competition> records = new ArrayList<>();
for (Competition competition : competitions.getRecords()) {
+ if (competition.getStatus()==4){
+ continue;
+ }
+
// 当前时间小于开始时间
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{
@@ -400,9 +406,9 @@
@RequestMapping(value = "/cancel")
- public Object cancel(Integer id) {
+ public Object cancel(Integer TCompetitionId) {
try {
- competitionClient.cancel(id);
+ competitionClient.cancel(TCompetitionId);
return SUCCESS_TIP;
}catch (Exception e){
e.printStackTrace();
@@ -453,4 +459,7 @@
}
+
+
+
}
--
Gitblit v1.7.1