From 21ee583563d59d9d04840f65cb0053df9b183554 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期一, 30 十月 2023 10:08:50 +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/ParticipantController.java | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
index 28e64f0..dce73b2 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java
@@ -1,5 +1,8 @@
package com.dsh.competition.controller;
+import com.dsh.competition.feignclient.account.AppUserClient;
+import com.dsh.competition.feignclient.account.StudentClient;
+import com.dsh.competition.feignclient.account.model.AppUser;
import com.dsh.competition.model.AddParticipant;
import com.dsh.competition.model.EditParticipant;
import com.dsh.competition.model.ParticipantVo;
@@ -13,6 +16,8 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
@@ -59,15 +64,27 @@
@PostMapping("/api/participant/queryParticipantList")
@ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", ""})
@ApiImplicitParams({
- @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
+ @ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9....."),
+ @ApiImplicitParam(value = "isPre(1过滤)", name = "是否过滤未实名", required = true, dataType = "int")
})
- public ResultUtil<List<ParticipantVo>> queryParticipantList(){
+ public ResultUtil<List<ParticipantVo>> queryParticipantList(Integer isPre){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
return ResultUtil.tokenErr();
}
List<ParticipantVo> participantVos = participantService.queryParticipantList(uid);
+ if (isPre!=null){
+ List<ParticipantVo> filteredParticipants = new ArrayList<>();
+
+ for (ParticipantVo participant : participantVos) {
+ if (participant.getIdcard() != null && !participant.getIdcard().isEmpty()) {
+ filteredParticipants.add(participant);
+ }
+ }
+ return ResultUtil.success(filteredParticipants);
+ }
+
return ResultUtil.success(participantVos);
}catch (Exception e){
e.printStackTrace();
@@ -77,6 +94,9 @@
+
+ @Resource
+ private StudentClient studentClient;
@ResponseBody
@PostMapping("/api/participant/editParticipant")
@@ -90,7 +110,17 @@
if(null == uid){
return ResultUtil.tokenErr();
}
- return participantService.editParticipant(uid, editParticipant);
+
+ if (editParticipant.getIsStudent()==0){
+ return participantService.editParticipant(uid, editParticipant);}
+ else {
+ AppUser appUser = new AppUser();
+ appUser.setId(editParticipant.getId());
+
+
+
+ return ResultUtil.success();
+ }
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
--
Gitblit v1.7.1