YD/YD_Event.Admin
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

参赛记录多团队显示

Browse Source
This commit is contained in:
马梓彭 2026-05-08 16:04:22 +08:00
parent 24296764bd
commit aa31a153a2
1 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
YD_Event.Application/Event/EventRecordService.cs
View File

@ -187,17 +187,6 @@ public class EventRecordService : BaseService<EventRegistration>, ITransient
var registrationItems = items.Where(i => row.RegistrationIds.Contains(i.RegistrationId)).ToList(); var registrationItems = items.Where(i => row.RegistrationIds.Contains(i.RegistrationId)).ToList();
foreach (var item in registrationItems) foreach (var item in registrationItems)
{ {
// 查找对应的成绩
var result = results.FirstOrDefault(r =>
r.RegistrationId == item.RegistrationId &&
r.ProjectId == item.ProjectId &&
r.GroupName == item.GroupName);
// 查找该项目的所有队员
var members = registrationPersons
.Where(p => p.RegistrationId == item.RegistrationId && p.ProjectId == item.ProjectId && p.GroupName == item.GroupName)
.ToList();
// 判断项目类型 // 判断项目类型
bool isIndividualProject = false; bool isIndividualProject = false;
int projectType = 0; int projectType = 0;
@ -212,6 +201,11 @@ public class EventRecordService : BaseService<EventRegistration>, ITransient
if (isIndividualProject) if (isIndividualProject)
{ {
// 个人项目：每个运动员单独一行 // 个人项目：每个运动员单独一行
// 查找该项目的所有队员（按 RegistrationItemId 筛选）
var members = registrationPersons
.Where(p => p.RegistrationItemId == item.Id)
.ToList();
foreach (var member in members) foreach (var member in members)
{ {
// 查找该成员对应的成绩 // 查找该成员对应的成绩
@ -248,7 +242,20 @@ public class EventRecordService : BaseService<EventRegistration>, ITransient
} }
else else
{ {
// 团队项目：所有队员一行 // 团队项目：每个 RegistrationItemId 单独一行，只显示该项目的队员和成绩
// 查找该项目的所有队员（按 RegistrationItemId 筛选）
var members = registrationPersons
.Where(p => p.RegistrationItemId == item.Id)
.ToList();
// 查找团队成绩：找到该团队中任意一个队员的成绩作为团队成绩
var teamMemberIds = members.Select(m => m.Id).ToList();
var result = results.FirstOrDefault(r =>
r.RegistrationId == item.RegistrationId &&
r.ProjectId == item.ProjectId &&
r.GroupName == item.GroupName &&
teamMemberIds.Contains(r.RegistrationPersonId));
string? memberNames = members.Count > 0 ? string.Join(", ", members.Select(m => m.Name)) : null; string? memberNames = members.Count > 0 ? string.Join(", ", members.Select(m => m.Name)) : null;
List<long>? memberIds = members.Count > 0 ? members.Select(m => m.Id).ToList() : null; List<long>? memberIds = members.Count > 0 ? members.Select(m => m.Id).ToList() : null;
var memberInfoList = members.Select(m => new MemberInfo var memberInfoList = members.Select(m => new MemberInfo