乐团梯队数据导出

mec-application/src/main/resources/exportColumnMapper.ini

@@ -364,4 +364,4 @@ fieldColumns = ["organName","studentId","studentName","createTime","time","amoun
 
 [乐团梯队数据导出]
 headColumns = ["乐团","长笛","单簧管","萨克斯","小号","圆号","长号","上低音号","大号","小军鼓","合计"]
-fieldColumns = ["name","flute","clarinet","saxophone","trumpet","horn","trombone","euphonium","tuba","snareDrum","total"]
+fieldColumns = ["musicGroupName","flute","clarinet","saxophone","trumpet","horn","trombone","euphonium","tuba","snareDrum","total"]

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

@@ -2884,7 +2884,7 @@ public class ExportServiceImpl implements ExportService {
             List<CourseScheduleEndDto> rows = courseScheduleService.exportSuperCourseSchedules(queryInfo);
             HSSFWorkbook workbook = POIUtil.exportExcel(new String[]{"分部名称", "乐团主管", "课程编号", "课程组编号", "开始时间",
                     "结束时间","班级声部", "课程名称", "课程类型", "教学模式",
-                    "教学点", "课程状态", "指导老师",  "助教", "是否点名", "是否有考勤申诉", "预计上课人数", "合作单位", "课酬", "课程收入"}, new String[]{
+                    "教学点", "课程状态", "指导老师",  "助教", "是否点名", "是否有考勤申诉", "预计上课人数", "合作单位", "课酬", "课耗收入"}, new String[]{
                     "organName", "educationTeacherName", "id", "musicGroupId", "startClassTime", "endClassTime", "subjectName", "name",
                     "courseScheduleType", "teachMode.msg", "schoolName", "status.msg", "teacherName",  "teachingUserNames",
                     "isCallNames.msg", "isComplaints != null && isComplaints == '1' ? '是':'否'", "studentNum", "cooperationOrgan", "expectSalary", "expectPrice"}, rows);

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

@@ -4213,7 +4213,6 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = new ArrayList<>();
 			musicGroupEchelonDataDtoList.addAll(v);
 			for (String musicGroupId : musicGroupEchelonDataDtoListMap.keySet()) {
-				musicGroupEchelonDataDtoList.addAll(musicGroupEchelonDataDtoListMap.get(musicGroupId));
 				List<ExportMusicGroupEchelonDataDto> dtos1 = musicGroupEchelonDataMap.get(musicGroupId);
 				if(CollectionUtils.isNotEmpty(dtos1)){
 					musicGroupEchelonDataDtoList.addAll(dtos1);

mec-util/src/main/java/com/ym/mec/util/excel/POIUtil.java

@@ -330,7 +330,7 @@ public class POIUtil {
 			StandardEvaluationContext context = null;
 			int size = dataset.size() + 1;
 			for (int i = 2; i <= size; i++) {
-				data = dataset.get(i - 1);
+				data = dataset.get(i - 2);
 				if (data != null) {
 
 					context = new StandardEvaluationContext(data);