|
@@ -4219,11 +4219,28 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
|
|
|
}
|
|
|
musicGroupEchelonDataDtoList.add(new ExportMusicGroupEchelonDataDto());
|
|
|
}
|
|
|
+ //根据gradeOrder按照年级排序,如果没有获取到对应的数据则放到第一条
|
|
|
+ musicGroupEchelonDataDtoList.sort(Comparator.comparingInt(entry -> gradeOrder.indexOf(entry.getMusicGroupName())));
|
|
|
resultMap.put(coopName,musicGroupEchelonDataDtoList);
|
|
|
});
|
|
|
return resultMap;
|
|
|
}
|
|
|
|
|
|
+ List<String> gradeOrder = Arrays.asList(
|
|
|
+ "一年级",
|
|
|
+ "二年级",
|
|
|
+ "三年级",
|
|
|
+ "四年级",
|
|
|
+ "五年级",
|
|
|
+ "六年级",
|
|
|
+ "七年级",
|
|
|
+ "八年级",
|
|
|
+ "九年级",
|
|
|
+ "高一",
|
|
|
+ "高二",
|
|
|
+ "高三"
|
|
|
+ );
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
|
public List<String> importMusicGroupPayment(MultipartFile file) throws Exception{
|