From cf8524f0eeb0e897e31077695a410fc97633c3f5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 15 三月 2024 20:35:36 +0800
Subject: [PATCH] 添加方法
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 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..f79e786 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,21 +121,23 @@
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);
-
} 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 +149,6 @@
continue;
}
linkedHashMap.put(participant.getIdcard(), participantVo);
-
}
for (TStudent tStudent : tStudents) {
@@ -162,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());
@@ -175,14 +177,7 @@
}
linkedHashMap.put(tStudent.getIdCard(), participantVo);
}
-
-
listVo1.addAll(linkedHashMap.values());
-
-
-// List<ParticipantVo> listVo1 = new ArrayList<>(linkedHashMap.values());
-
-
return listVo1;
}
@@ -213,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()));
--
Gitblit v1.7.1