From 2493985a5bdfc6496381b39de0f9713b79c2e51d Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 25 十一月 2023 11:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TCompetitionController.java | 71 ++++++++++++++++++++---------------
1 files changed, 40 insertions(+), 31 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 b5f9feb..7b37e15 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
@@ -278,35 +278,41 @@
ListQuery listQuery = new ListQuery(page.getSize(),page.getCurrent(),provinceCode,cityCode,eventName,time,state,registerCondition,ids);
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.getStatus()!=state && state != null){
- }else{
- records.add(competition);
- }
- for (TStore tStore : list) {
- String[] split = competition.getStoreId().split(",");
- for (String s : split) {
- if(s.equals(String.valueOf(tStore.getId()))){
- if (competition.getStoreName()==null){
- competition.setStoreName(tStore.getName());
- }else {
- competition.setStoreName(competition.getStoreName()+"，"+tStore.getName());
- }
- }
- }
- }
- }
+// 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{
+// competition.setStatus(3);
+// }
+// }
+// if (competition.getStatus()!=state && state != null){
+// }else{
+// records.add(competition);
+// }
+// for (TStore tStore : list) {
+// String[] split = competition.getStoreId().split(",");
+// for (String s : split) {
+// if(s.equals(String.valueOf(tStore.getId()))){
+// if (competition.getStoreName()==null){
+// competition.setStoreName(tStore.getName());
+// }else {
+// competition.setStoreName(competition.getStoreName()+"，"+tStore.getName());
+// }
+// }
+// }
+// }
+// }
competitions.setRecords(records);
System.err.println(competitions.getRecords());
return super.packForBT(competitions);
@@ -393,9 +399,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();
@@ -446,4 +452,7 @@
}
+
+
+
}
--
Gitblit v1.7.1