From 334fbd5f1a5a4e85c198560bd024211ba4cf99b1 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期一, 11 三月 2024 18:27:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
index 150060b..4249541 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/WorldCupController.java
@@ -161,7 +161,11 @@
@ResponseBody
@PostMapping("/addWorldCup")
public ResultUtil addWorldCup(WorldCup worldCup, String stores){
- worldCup.setStatus(1);
+ if(worldCup.getStartTime().before(new Date())){
+ worldCup.setStatus(2);
+ }else{
+ worldCup.setStatus(1);
+ }
worldCup.setCreateTime(new Date());
worldCup.setMatchNumber(0);
Integer integer = worldCupClient.addWorldCup(worldCup);
@@ -195,6 +199,11 @@
if(worldCup1.getStartTime().before(DateUtil.getDate())){
return ResultUtil.error("赛事已开始，不能编辑");
}
+ if(worldCup.getStartTime().before(new Date())){
+ worldCup.setStatus(2);
+ }else{
+ worldCup.setStatus(1);
+ }
worldCupClient.editWorldCup(worldCup);
worldCupStoreClient.delWorldCupStore(worldCup.getId());
JSONArray jsonArray = JSON.parseArray(stores);
--
Gitblit v1.7.1