From 4b1453e19306592f703aa794e238bd028f67d320 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 24 一月 2025 16:20:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-competition/src/main/java/com/dsh/competition/service/impl/ParticipantServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 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 dfd7378..d56c271 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
@@ -144,11 +144,11 @@
participantVo.setBirthday(format);
}
participantVo.setGender(participant.getGender());
-// if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
-// listVo1.add(participantVo);
-// continue;
-// }
- linkedHashMap.put(participant.getName(), participantVo);
+ if (participant.getIdcard() == null || participant.getIdcard().isEmpty()) {
+ listVo1.add(participantVo);
+ continue;
+ }
+ linkedHashMap.put(participant.getIdcard(), participantVo);
}
for (TStudent tStudent : tStudents) {
@@ -171,11 +171,11 @@
}
participantVo.setGender(tStudent.getSex());
participantVo.setIsStudent(1);
-// if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
-// listVo1.add(participantVo);
-// continue;
-// }
- linkedHashMap.put(tStudent.getName(), participantVo);
+ if (tStudent.getIdCard() == null || tStudent.getIdCard().isEmpty()) {
+ listVo1.add(participantVo);
+ continue;
+ }
+ linkedHashMap.put(tStudent.getIdCard(), participantVo);
}
listVo1.addAll(linkedHashMap.values());
return listVo1;
@@ -303,6 +303,7 @@
if(null != paymentCompetition){
competitionUser.setState(paymentCompetition.getPayStatus());
}
+ competitionUser.setInsertTime(userCompetition.getInsertTime());
list.add(competitionUser);
}
Page<CompetitionUser> page = new Page<>();
--
Gitblit v1.7.1