From 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:32 +0800
Subject: [PATCH] bug修改
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 insertions(+), 12 deletions(-)
diff --git a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
index ac2c755..efaa004 100644
--- a/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
+++ b/cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java
@@ -23,6 +23,7 @@
import com.dsh.competition.util.JuHeUtil;
import com.dsh.competition.util.ResultUtil;
import com.dsh.competition.util.ToolUtil;
+import io.undertow.util.DateUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -88,6 +89,26 @@
participant.setState(1);
participant.setInsertTime(new Date());
this.save(participant);
+ TStudent tStudent = new TStudent();
+ tStudent.setAppUserId(uid);
+ tStudent.setName(addParticipant.getName());
+ tStudent.setPhone(addParticipant.getPhone());
+ if (ToolUtil.isNotEmpty(addParticipant.getBirthday())){
+ Date date = DateUtils.parseDate(addParticipant.getBirthday());
+ tStudent.setBirthday(date);
+ }else{
+ String birthDateStr = addParticipant.getIdcard().substring(6, 14);
+ SimpleDateFormat dateFormat = new SimpleDateFormat("yyyyMMdd");
+ Date parse = dateFormat.parse(birthDateStr);
+ tStudent.setBirthday(parse);
+ }
+ tStudent.setSex(addParticipant.getGender());
+ tStudent.setIdCard(addParticipant.getIdcard());
+ tStudent.setState(1);
+ tStudent.setInsertTime(new Date());
+ tStudent.setHeadImg(addParticipant.getHeadImg());
+ tStudent.setIsDefault(2);
+ studentClient.addStudent(tStudent);
return ResultUtil.success();
}
@@ -119,23 +140,30 @@
participantVo.setId(participant.getId());
participantVo.setName(participant.getName());
participantVo.setIdcard(participant.getIdcard());
- Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
- participantVo.setAge(age);
- Student student = studentClient.queryStudentByPhone(participant.getPhone() == null ? "0" : participant.getPhone());
+ if (null != participant.getBirthday()){
+ Integer age = Integer.valueOf(sdf_year.format(new Date())) - Integer.valueOf(sdf_year.format(participant.getBirthday()));
+ participantVo.setAge(age);
+ }else{
+ participantVo.setAge(18);
+ }
+ Student student = null;
+ if(ToolUtil.isNotEmpty(participant.getPhone())){
+ student = studentClient.queryStudentByPhone(participant.getPhone());
+ }
//设为不是学员
participantVo.setIsStudent(0);
if (null != student) {
Integer integer = coursePackagePaymentClient.queryResidueClassHour(student.getId());
participantVo.setResidueClassHour(integer);
-
} else {
participantVo.setResidueClassHour(0);
}
participantVo.setPhone(participant.getPhone());
participantVo.setHeight(participant.getHeight());
participantVo.setWeight(participant.getWeight());
+ participantVo.setHeadImg(participant.getHeadImg());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != participant.getBirthday()) {
String format = sdf.format(participant.getBirthday());
@@ -147,7 +175,6 @@
continue;
}
linkedHashMap.put(participant.getIdcard(), participantVo);
-
}
for (TStudent tStudent : tStudents) {
@@ -162,6 +189,7 @@
participantVo.setPhone(tStudent.getPhone());
participantVo.setHeight(tStudent.getHeight().intValue());
participantVo.setWeight(tStudent.getWeight());
+ participantVo.setHeadImg(tStudent.getHeadImg());
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
if (null != tStudent.getBirthday()) {
String format = sdf.format(tStudent.getBirthday());
@@ -175,14 +203,7 @@
}
linkedHashMap.put(tStudent.getIdCard(), participantVo);
}
-
-
listVo1.addAll(linkedHashMap.values());
-
-
-// List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());
-
-
return listVo1;
}
@@ -213,6 +234,7 @@
participant.setGender(editParticipant.getGender());
participant.setIdcard(editParticipant.getIdcard());
participant.setName(editParticipant.getName());
+ participant.setHeadImg(editParticipant.getHeadImg());
if (ToolUtil.isNotEmpty(editParticipant.getBirthday())) {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
participant.setBirthday(sdf.parse(editParticipant.getBirthday()));
@@ -307,6 +329,7 @@
if(null != paymentCompetition){
competitionUser.setState(paymentCompetition.getPayStatus());
}
+ competitionUser.setInsertTime(userCompetition.getInsertTime());
list.add(competitionUser);
}
Page<CompetitionUser> page = new Page<>();
--
Gitblit v1.7.1