From 6a8b55a2183720ff6106f581695298168896cadc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 16:03:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/CompetitionController.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 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 901066a..177094a 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
@@ -32,6 +32,7 @@
import java.io.PrintWriter;
import java.text.SimpleDateFormat;
import java.util.*;
+import java.util.concurrent.CompletionService;
import java.util.stream.Collectors;
/**
@@ -70,13 +71,30 @@
@Autowired
private AppUserClient appUserClient;
+
/**
* 获取赛事报名记录
*/
@ResponseBody
@RequestMapping("/base/competition/listAllPayment")
public List<PaymentCompetition> listAllPayment(@RequestBody CompetitionQuery query){
- return paymentCompetitionService.listAll(query);
+ List<PaymentCompetition> paymentCompetitions = paymentCompetitionService.listAll(query);
+ List<PaymentCompetition> result = new ArrayList<>();
+ if (query.getOperatorId()!=null){
+ for (PaymentCompetition paymentCompetition : paymentCompetitions) {
+ Integer competitionId = paymentCompetition.getCompetitionId();
+ Competition byId = cttService.getById(competitionId);
+ if (byId!=null){
+ Integer operatorId = byId.getOperatorId();
+ if (operatorId!=null){
+ if (operatorId == query.getOperatorId()){
+ result.add(paymentCompetition);
+ }
+ }
+ }
+ }
+ }
+ return paymentCompetitions;
}
@ResponseBody
@PostMapping("/base/competition/getPayedCompetitions")
@@ -117,6 +135,14 @@
}
+ @PostMapping("/base/competition/queryByCode")
+ public Integer queryByCode(@RequestBody String code){
+
+ return paymentCompetitionService.queryByCode(code);
+ }
+
+
+
@PostMapping("/base/competition/getCompetitionsDetails")
public List<PurchaseRecordVo> getStuSourseList(@RequestBody GetStuSourseList sourseList){
--
Gitblit v1.7.1