From d20dbd5d97b3f418533d5d23fd337cdec9f95939 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 14 十二月 2023 09:24:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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..fd80080 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
@@ -31,6 +31,7 @@
import org.springframework.web.bind.annotation.ResponseBody;
import sun.rmi.runtime.Log;
+import javax.jws.soap.SOAPBinding;
import javax.servlet.http.HttpServletResponse;
import java.io.OutputStream;
import java.text.DateFormat;
@@ -286,17 +287,19 @@
Page<Competition> competitions = competitionClient.list(listQuery);
List<Competition> records = new ArrayList<>();
for (Competition competition : competitions.getRecords()) {
- // 当前时间小于开始时间
- 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);
- }
- }
+// // 当前时间小于开始时间
+// 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);
+// }
+// }
if (competition.getStatus()!=state && state != null){
}else{
records.add(competition);
@@ -322,12 +325,12 @@
@RequestMapping(value = "/listUser/{id}")
@ResponseBody
- public Object listUser(@PathVariable Integer id,Integer state) {
+ public Object listUser(@PathVariable Integer id,Integer state, Integer offset,Integer limit) {
try {
- Page<Object> page = new PageFactory<>().defaultPage();
- Page<CompetitionUser> data = competitionClient.getPeopleFromId
- (new GetPeopleQuery(page.getSize(),page.getCurrent(),id,state));
- return super.packForBT(data);
+// Page<Object> page = new PageFactory<>().defaultPage();
+// Page<CompetitionUser> data = competitionClient.getPeopleFromId(new GetPeopleQuery(limit,offset,id,state));
+ List <CompetitionUser> data = competitionClient.getPeopleFromId1(new GetPeopleQuery(limit,offset,id,state));
+ return data;
}catch (Exception e){
e.printStackTrace();
return ERROR;
@@ -398,18 +401,18 @@
}
}
-
+ @ResponseBody
@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();
return ERROR;
}
}
-
+ @ResponseBody
@RequestMapping(value = "/getPeopleFromId")
public Object getPeopleFromId(Integer id,Integer state) {
try {
@@ -453,4 +456,7 @@
}
+
+
+
}
--
Gitblit v1.7.1