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/service/impl/ParticipantServiceImpl.java | 54 +++++++++++++++++++++++++++---------------------------
1 files changed, 27 insertions(+), 27 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 b8b31e8..dfd7378 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
@@ -121,35 +121,34 @@
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());
-
+ 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);
- participantVo.setIsStudent(1);
-
} 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());
participantVo.setBirthday(format);
}
participantVo.setGender(participant.getGender());
- if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
- listVo1.add(participantVo);
- continue;
- }
- linkedHashMap.put(participant.getIdcard(), participantVo);
-// listVo.add(participantVo);
-
+// if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
+// listVo1.add(participantVo);
+// continue;
+// }
+ linkedHashMap.put(participant.getName(), participantVo);
}
for (TStudent tStudent : tStudents) {
@@ -164,6 +163,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());
@@ -171,20 +171,13 @@
}
participantVo.setGender(tStudent.getSex());
participantVo.setIsStudent(1);
- if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
- listVo1.add(participantVo);
- continue;
- }
- linkedHashMap.put(tStudent.getIdCard(), participantVo);
+// if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
+// listVo1.add(participantVo);
+// continue;
+// }
+ linkedHashMap.put(tStudent.getName(), participantVo);
}
-
-
listVo1.addAll(linkedHashMap.values());
-
-
-// List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());
-
-
return listVo1;
}
@@ -215,6 +208,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()));
@@ -232,10 +226,16 @@
* @throws Exception
*/
@Override
- public ResultUtil delParticipant(Integer id) throws Exception {
- Participant participant = this.getById(id);
- participant.setState(3);
- this.updateById(participant);
+ public ResultUtil delParticipant(Integer id, Integer isStudent) throws Exception {
+ if(isStudent == 1){
+ TStudent tStudent = studentClient.queryById(id);
+ tStudent.setState(3);
+ studentClient.updateAppUser(tStudent);
+ }else{
+ Participant participant = this.getById(id);
+ participant.setState(3);
+ this.updateById(participant);
+ }
return ResultUtil.success();
}
--
Gitblit v1.7.1