From ddbb38c54db9c3670e5ff53f4bf713525de1099d Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 14 十一月 2023 09:12:10 +0800
Subject: [PATCH] 后台bug修改
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 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 aa4e568..a032a8d 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
@@ -2,6 +2,7 @@
import cn.hutool.core.date.DateUtil;
+import cn.hutool.poi.excel.ExcelUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -33,7 +34,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.io.OutputStream;
import java.io.PrintWriter;
+import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.CompletionService;
@@ -95,13 +98,15 @@
// 获取到赛事id集合 去重
List<Integer> collect = comIds.stream().distinct().collect(Collectors.toList());
// 根据赛事id 查询赛事支付记录 获取用户ids
- List<PaymentCompetition> competitionId = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
- .in("competitionId", collect));
+ if (collect.size() == 0){
+ return new ArrayList<>();
+ }else{
+ List<Integer> userIds = paymentCompetitionService.list(new QueryWrapper<PaymentCompetition>()
+ .in("competitionId", collect)).stream()
+ .map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
+ return userIds;
+ }
-// .stream().map(PaymentCompetition::getAppUserId).collect(Collectors.toList());
-
-
- return null;
}
/**
* 获取赛事报名记录
@@ -592,15 +597,14 @@
wrapper.like(Competition::getName,listQuery.getEventName());
}
if(ToolUtil.isNotEmpty(listQuery.getTime())){
- wrapper.gt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
- wrapper.lt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
+ wrapper.lt(Competition::getStartTime,listQuery.getTime().split(" - ")[0]+" 00:00:00");
+ wrapper.gt(Competition::getEndTime,listQuery.getTime().split(" - ")[1]+" 23:59:59");
}
- if(ToolUtil.isNotEmpty(listQuery.getState())){
- wrapper.eq(Competition::getStatus,listQuery.getState());
- }
+
if(ToolUtil.isNotEmpty(listQuery.getRegisterCondition())){
wrapper.eq(Competition::getRegisterCondition,listQuery.getRegisterCondition());
}
+
wrapper.in(Competition::getStoreId,listQuery.getIds());
wrapper.eq(Competition::getAuditStatus,2);
wrapper.orderByDesc(Competition::getInsertTime);
@@ -621,7 +625,7 @@
wrapper.eq(Competition::getProvinceCode,listQuery.getProvinceCode());
}
if(ToolUtil.isNotEmpty(listQuery.getCityCode())){
- wrapper.eq(Competition::getProvinceCode,listQuery.getCityCode());
+ wrapper.eq(Competition::getCityCode,listQuery.getCityCode());
}
if(ToolUtil.isNotEmpty(listQuery.getEventName())){
wrapper.like(Competition::getName,listQuery.getEventName());
@@ -689,6 +693,13 @@
e.printStackTrace();
return null;
}
+ }
+ @PostMapping("/base/competition/getPeoples")
+ @ResponseBody
+ public List<CompetitionUser> getPeoples(@RequestBody GetPeopleQuery getPeopleQuery){
+ List<CompetitionUser> list = participantService.getPeoples(
+ getPeopleQuery.getId(),getPeopleQuery.getState());
+ return list;
}
@@ -821,9 +832,7 @@
map.put("monthsUser",monthsUser);
return map;
-
-
-
}
+
}
--
Gitblit v1.7.1