乐团梯队数据导出

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

@@ -4441,7 +4441,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 			organNameMap = this.getMap("organization","id_","name_",organIdList,queryInfo.getTenantId(),Integer.class,String.class);
 		}
 
-		List<Integer> schoolIdList = results.stream().map(e -> e.getSchoolId()).distinct().collect(Collectors.toList());
+		List<Integer> schoolIdList = results.stream().map(e -> e.getSchoolId()).filter(e->e != null).distinct().collect(Collectors.toList());
 
 		Map<Integer, String> schoolameMap = new HashMap<>();
 		if(CollectionUtils.isNotEmpty(schoolIdList)){

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

@@ -2871,7 +2871,7 @@ public class ExportServiceImpl implements ExportService {
                     "结束时间","班级声部", "课程名称", "课程类型", "教学模式",
                     "教学点", "课程状态", "指导老师",  "助教", "是否点名", "是否有考勤申诉", "预计上课人数", "合作单位"}, new String[]{
                     "organName", "educationTeacherName", "id", "musicGroupId", "startClassTime", "endClassTime", "subjectName", "name",
-                    "courseScheduleType", "teachMode.msg", "schoolName", "status.msg", "teacherName",  "teachingUserNames",
+                    "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName",  "teachingUserNames",
                     "isCallNames.msg", "isComplaints != null && isComplaints == '1' ? '是':'否'", "studentNum", "cooperationOrgan"}, rows);
             exportManagerDownload(workbook, managerDownload);
         } catch (Exception e) {

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

@@ -4210,15 +4210,15 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			//按乐团编号分组
 			Map<String, List<ExportMusicGroupEchelonDataDto>> musicGroupEchelonDataDtoListMap =
 					dtos.stream().collect(Collectors.groupingBy(ExportMusicGroupEchelonDataDto::getMusicGroupId));
-			musicGroupEchelonDataDtoListMap.forEach((k1,v1) -> {
-				List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = musicGroupEchelonDataMap.get(k1);
-				if(CollectionUtils.isNotEmpty(musicGroupEchelonDataDtoList)){
-					v1.addAll(musicGroupEchelonDataDtoList);
+			List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = new ArrayList<>();
+			for (String musicGroupId : musicGroupEchelonDataDtoListMap.keySet()) {
+				musicGroupEchelonDataDtoList = musicGroupEchelonDataMap.get(musicGroupId);
+				if(CollectionUtils.isEmpty(musicGroupEchelonDataDtoList)){
+					continue;
 				}
-				//插入一条空白行数据
-				v1.add(new ExportMusicGroupEchelonDataDto());
-			});
-			resultMap.put(coopName,v);
+				musicGroupEchelonDataDtoList.add(new ExportMusicGroupEchelonDataDto());
+			}
+			resultMap.put(coopName,musicGroupEchelonDataDtoList);
 		});
 		return resultMap;
 	}

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

@@ -296,6 +296,7 @@ public class POIUtil {
 			// 设置表头
 			// 创建第一行
 			//创建合并单元格
+			sheet.createRow(0);
 			sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 10));
 			sheet.getRow(0).getCell(1).setCellValue(k.toString());
 			//设置sheet名称