From 5b83b50d38c757b38dcc87a40a17d34cc2948e10 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 09:49:15 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 a2371bb..95e7551 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
@@ -75,7 +75,7 @@
@ResponseBody
@PostMapping("/api/participant/queryParticipantList")
- @ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", "我的二维码", "人员管理", "社区世界杯"})
+ @ApiOperation(value = "获取参赛人员列表", tags = {"APP-赛事活动列表", "我的二维码", "人员管理", "APP-社区世界杯"})
@ApiImplicitParams({
@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")
@@ -136,14 +136,13 @@
TStudent student1 = studentClient.queryById(editParticipant.getId());
student.setName(student1.getName());
student.setIdCard(editParticipant.getIdcard());
+ student.setHeadImg(editParticipant.getHeadImg());
if (editParticipant.getHeight() != null) {
student.setHeight(Double.valueOf(editParticipant.getHeight()));
}
-
if (editParticipant.getWeight() != null) {
student.setWeight(editParticipant.getWeight());
}
-
if (ToolUtil.isNotEmpty(student.getName()) && ToolUtil.isNotEmpty(student.getIdCard())) {
Boolean aBoolean = JuHeUtil.idcardAuthentication(student.getIdCard(), student.getName());
if (!aBoolean) {
@@ -169,13 +168,13 @@
@ApiImplicitParams({
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil delParticipant(Integer id) {
+ public ResultUtil delParticipant(Integer id, Integer isStudent) {
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if (null == uid) {
return ResultUtil.tokenErr();
}
- return participantService.delParticipant(id);
+ return participantService.delParticipant(id, isStudent);
} catch (Exception e) {
e.printStackTrace();
return ResultUtil.runErr();
@@ -206,4 +205,11 @@
public Integer counts(@RequestBody Integer stuId) {
return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId", stuId));
}
+
+
+ @ResponseBody
+ @PostMapping("/participant/getParticipant")
+ public Participant getParticipant(@RequestBody Long id){
+ return participantService.getById(id);
+ }
}
--
Gitblit v1.7.1