From 331ae50b1cdcb31a4a0c182abb82aec5c1b12f83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 15 十一月 2023 09:40:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 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 5d483c2..3566d7d 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,10 +1,18 @@
package com.dsh.competition.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.competition.entity.UserCompetition;
+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.feignclient.account.model.Student;
+import com.dsh.competition.feignclient.account.model.TStudent;
import com.dsh.competition.model.AddParticipant;
import com.dsh.competition.model.EditParticipant;
import com.dsh.competition.model.ParticipantVo;
import com.dsh.competition.model.SaveParticipant;
import com.dsh.competition.service.IParticipantService;
+import com.dsh.competition.service.UserCompetitionService;
import com.dsh.competition.util.ResultUtil;
import com.dsh.competition.util.TokenUtil;
import io.swagger.annotations.ApiImplicitParam;
@@ -13,6 +21,7 @@
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;
@@ -91,6 +100,11 @@
+ @Resource
+ private StudentClient studentClient;
+
+ @Resource
+ private AppUserClient appUserClient;
@ResponseBody
@PostMapping("/api/participant/editParticipant")
@ApiOperation(value = "编辑参赛人员", tags = {"APP-赛事活动列表", ""})
@@ -103,7 +117,26 @@
if(null == uid){
return ResultUtil.tokenErr();
}
+ int numDigits = String.valueOf(editParticipant.getId()).length();
+
+
+
+ if (numDigits==9){
return participantService.editParticipant(uid, editParticipant);
+ }
+ else {
+
+
+ TStudent student = new TStudent();
+ student.setId(editParticipant.getId());
+ student.setName(editParticipant.getName());
+ student.setIdCard(editParticipant.getIdcard());
+ student.setHeight(Double.valueOf(editParticipant.getHeight()));
+ student.setWeight(editParticipant.getWeight());
+ student.setPhone(editParticipant.getPhone());
+ studentClient.updateAppUser(student);
+ return ResultUtil.success();
+ }
}catch (Exception e){
e.printStackTrace();
return ResultUtil.runErr();
@@ -145,4 +178,14 @@
e.printStackTrace();
}
}
+
+ @Autowired
+ private UserCompetitionService userCompetitionService;
+
+
+ @ResponseBody
+ @PostMapping("/participant/counts")
+ public Integer counts(@RequestBody Integer stuId){
+ return userCompetitionService.count(new QueryWrapper<UserCompetition>().eq("participantId",stuId));
+ }
}
--
Gitblit v1.7.1