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

fix: 修复调度数据API返回重复分组问题

Browse Source 
按 schedule_group_id 去重，避免同一分组在 dispatch-data 接口中重复出现

Co-authored-by: factory-droid[bot] <138933559+factory-droid[bot]@users.noreply.github.com>
This commit is contained in:
Z-WICK
2026-01-26 13:20:58 +08:00
co-authored by factory-droid[bot]
parent 1002fc0945
commit adeeeb4be2
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/org/springblade/modules/martial/service/impl/MartialScheduleServiceImpl.java
+10 -2
View File
@@ -813,10 +813,18 @@ public class MartialScheduleServiceImpl extends ServiceImpl<MartialScheduleMappe
return vo;
}
// 2. 构建返回数据
// 2. 按 schedule_group_id 去重，避免同一分组重复出现
Map<Long, MartialScheduleDetail> uniqueDetails = new LinkedHashMap<>();
for (MartialScheduleDetail detail : details) {
if (!uniqueDetails.containsKey(detail.getScheduleGroupId())) {
uniqueDetails.put(detail.getScheduleGroupId(), detail);
}
}
// 3. 构建返回数据
List<org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchGroup> groups = new ArrayList<>();
for (MartialScheduleDetail detail : details) {
for (MartialScheduleDetail detail : uniqueDetails.values()) {
// 查询分组信息
MartialScheduleGroup group = scheduleGroupMapper.selectById(detail.getScheduleGroupId());
if (group == null) {
src/main/java/org/springblade/modules/martial/service/impl/ScheduleDispatchServiceImpl.java
+10 -2
View File
@@ -45,10 +45,18 @@ public class ScheduleDispatchServiceImpl implements IScheduleDispatchService {
return vo;
}
// 2. 构建返回数据
// 2. 按 schedule_group_id 去重，避免同一分组重复出现
java.util.Map<Long, MartialScheduleDetail> uniqueDetails = new java.util.LinkedHashMap<>();
for (MartialScheduleDetail detail : details) {
if (!uniqueDetails.containsKey(detail.getScheduleGroupId())) {
uniqueDetails.put(detail.getScheduleGroupId(), detail);
}
}
// 3. 构建返回数据
List<org.springblade.modules.martial.pojo.vo.DispatchDataVO.DispatchGroup> groups = new ArrayList<>();
for (MartialScheduleDetail detail : details) {
for (MartialScheduleDetail detail : uniqueDetails.values()) {
// 查询分组信息
MartialScheduleGroup group = scheduleGroupMapper.selectById(detail.getScheduleGroupId());
if (group == null) {