|
|
@@ -4210,18 +4210,19 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
//按乐团编号分组
|
|
|
Map<String, List<ExportMusicGroupEchelonDataDto>> musicGroupEchelonDataDtoListMap =
|
|
|
dtos.stream().collect(Collectors.groupingBy(ExportMusicGroupEchelonDataDto::getMusicGroupId));
|
|
|
- List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = new ArrayList<>();
|
|
|
+ List<ExportMusicGroupEchelonDataDto> result = new ArrayList<>();
|
|
|
for (String musicGroupId : musicGroupEchelonDataDtoListMap.keySet()) {
|
|
|
+ List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = new ArrayList<>();
|
|
|
musicGroupEchelonDataDtoList.addAll(musicGroupEchelonDataDtoListMap.get(musicGroupId));
|
|
|
List<ExportMusicGroupEchelonDataDto> dtos1 = musicGroupEchelonDataMap.get(musicGroupId);
|
|
|
if(CollectionUtils.isNotEmpty(dtos1)){
|
|
|
musicGroupEchelonDataDtoList.addAll(dtos1);
|
|
|
}
|
|
|
+ musicGroupEchelonDataDtoList.sort(Comparator.comparingInt(entry -> gradeOrder.indexOf(entry.getMusicGroupName())));
|
|
|
musicGroupEchelonDataDtoList.add(new ExportMusicGroupEchelonDataDto());
|
|
|
+ result.addAll(musicGroupEchelonDataDtoList);
|
|
|
}
|
|
|
- //根据gradeOrder按照年级排序,如果没有获取到对应的数据则放到第一条
|
|
|
- musicGroupEchelonDataDtoList.sort(Comparator.comparingInt(entry -> gradeOrder.indexOf(entry.getMusicGroupName())));
|
|
|
- resultMap.put(coopName,musicGroupEchelonDataDtoList);
|
|
|
+ resultMap.put(coopName,result);
|
|
|
});
|
|
|
return resultMap;
|
|
|
}
|
|
|
@@ -4234,8 +4235,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
"五年级",
|
|
|
"六年级",
|
|
|
"七年级",
|
|
|
+ "七年级/初一",
|
|
|
"八年级",
|
|
|
+ "八年级/初二",
|
|
|
"九年级",
|
|
|
+ "九年级/初三",
|
|
|
"高一",
|
|
|
"高二",
|
|
|
"高三"
|
