From a9564eae9f0169ca39329b2f14a8f13d13358a0a Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期五, 17 十一月 2023 15:28:44 +0800
Subject: [PATCH] 11.7
---
cloud-server-competition/src/main/java/com/dsh/competition/controller/ParticipantController.java | 29 +++++++++++++++++++++++++----
1 files changed, 25 insertions(+), 4 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 3566d7d..2494018 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,6 +1,7 @@
package com.dsh.competition.controller;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.dsh.competition.entity.Participant;
import com.dsh.competition.entity.UserCompetition;
import com.dsh.competition.feignclient.account.AppUserClient;
import com.dsh.competition.feignclient.account.StudentClient;
@@ -13,8 +14,10 @@
import com.dsh.competition.model.SaveParticipant;
import com.dsh.competition.service.IParticipantService;
import com.dsh.competition.service.UserCompetitionService;
+import com.dsh.competition.util.JuHeUtil;
import com.dsh.competition.util.ResultUtil;
import com.dsh.competition.util.TokenUtil;
+import com.dsh.competition.util.ToolUtil;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
@@ -122,17 +125,35 @@
if (numDigits==9){
- return participantService.editParticipant(uid, editParticipant);
+ Participant byId = participantService.getById(editParticipant.getId());
+ editParticipant.setName(byId.getName());
+ return participantService.editParticipant(uid, editParticipant);
}
else {
TStudent student = new TStudent();
student.setId(editParticipant.getId());
- student.setName(editParticipant.getName());
+
+ TStudent student1 = studentClient.queryById(editParticipant.getId());
+ student.setName(student1.getName());
student.setIdCard(editParticipant.getIdcard());
- student.setHeight(Double.valueOf(editParticipant.getHeight()));
- student.setWeight(editParticipant.getWeight());
+ 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){
+ return ResultUtil.error("身份证和姓名不匹配");
+ }
+ }
+
+
student.setPhone(editParticipant.getPhone());
studentClient.updateAppUser(student);
return ResultUtil.success();
--
Gitblit v1.7.1