乐团梯队数据导出

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -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{

mec-biz/src/main/resources/config/mybatis/CourseScheduleMapper.xml

@@ -2526,7 +2526,7 @@
         CASE WHEN COUNT(CASE WHEN sa.id_ IS NULL OR (sa.status_ = 'LEAVE' AND sa.remark_ IS NOT NULL) THEN NULL ELSE 1 END) > 0 THEN 1 ELSE 0 END isCallNames,
         CASE WHEN COUNT(CASE WHEN ta.is_complaints_ = 1 THEN 1 ELSE NULL END) > 0 THEN '1' ELSE '0' END is_complaints_,
         GROUP_CONCAT(distinct CASE WHEN csts.teacher_role_ = 'TEACHING' THEN csts.user_id_ END) teachingTeacherIds,
-        SUM(csts.expect_salary_) expect_salary_,SUM(cssp.expect_price_) expect_price_
+        csts.expect_salary_,SUM(cssp.expect_price_) expect_price_
         FROM
         course_schedule cs
         LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_