martial/martial-master
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 调度页面显示所有参赛选手

Browse Source 
撤销之前的集体项目分组逻辑，所有项目都显示全部参赛者

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
This commit is contained in:
Z-WICK
2026-01-26 12:32:33 +08:00
co-authored by factory-droid[bot]
parent 63a6a7331b
commit 4ca5d93877
1 changed files with 13 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
+13 -37
View File
@@ -841,43 +841,19 @@ public class MartialScheduleServiceImpl extends ServiceImpl<MartialScheduleMappe
List<org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant> participantVOs; List<org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant> participantVOs;
// 集体项目(projectType=2)按organization分组，只返回一条记录代表整个队伍 // 所有项目都返回全部参赛者
if (group.getProjectType() != null && group.getProjectType() == 2) { participantVOs = participants.stream().map(p -> {
// 按organization分组，取每组第一个作为代表 org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant pVO =
java.util.Map<String, MartialScheduleParticipant> orgMap = new java.util.LinkedHashMap<>(); new org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant();
for (MartialScheduleParticipant p : participants) { pVO.setId(p.getId());
String org = p.getOrganization() != null ? p.getOrganization() : "未知单位"; pVO.setParticipantId(p.getParticipantId());
if (!orgMap.containsKey(org)) { pVO.setOrganization(p.getOrganization());
orgMap.put(org, p); pVO.setPlayerName(p.getPlayerName());
} pVO.setProjectName(p.getProjectName());
} pVO.setCategory(p.getCategory());
participantVOs = orgMap.values().stream().map(p -> { pVO.setPerformanceOrder(p.getPerformanceOrder());
org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant pVO = return pVO;
new org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant(); }).collect(Collectors.toList());
pVO.setId(p.getId());
pVO.setParticipantId(p.getParticipantId());
pVO.setOrganization(p.getOrganization());
pVO.setPlayerName(p.getOrganization()); // 集体项目显示单位名称
pVO.setProjectName(p.getProjectName());
pVO.setCategory(p.getCategory());
pVO.setPerformanceOrder(p.getPerformanceOrder());
return pVO;
}).collect(Collectors.toList());
} else {
// 单人项目，正常返回所有参赛者
participantVOs = participants.stream().map(p -> {
org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant pVO =
new org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchParticipant();
pVO.setId(p.getId());
pVO.setParticipantId(p.getParticipantId());
pVO.setOrganization(p.getOrganization());
pVO.setPlayerName(p.getPlayerName());
pVO.setProjectName(p.getProjectName());
pVO.setCategory(p.getCategory());
pVO.setPerformanceOrder(p.getPerformanceOrder());
return pVO;
}).collect(Collectors.toList());
}
groupVO.setParticipants(participantVOs); groupVO.setParticipants(participantVOs);
groups.add(groupVO); groups.add(groupVO);