乐团梯队数据导出

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

@@ -4347,7 +4347,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             Map<Integer, String> classGroupSubjectNameMap = MapUtil.convertIntegerMap(classGroupSubjectNameMaps);
             Map<Long, String> eduName = null;
             Map<String, MusicGroupBasicDto> cooperationMap = new HashMap<>();
-			Map<String, String> vipGroupTypeMap = new HashMap<>();
+			Map<Long, String> vipGroupTypeMap = new HashMap<>();
             if (queryInfo.isExport()) {
                 List<Long> musicCourseIds = results.stream().filter(e -> e.getGroupType() == MUSIC).map(CourseScheduleEndDto::getId).collect(Collectors.toList());
                 eduName = new HashMap<>(courseScheduleIds.size());
@@ -4378,7 +4378,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
             for (CourseScheduleEndDto result : results) {
 				if (queryInfo.isExport()) {
 					if(result.getType() == CourseScheduleType.VIP){
-						result.setCourseScheduleType(vipGroupTypeMap.get(result.getMusicGroupId()));
+						result.setCourseScheduleType(vipGroupTypeMap.get(Long.parseLong(result.getMusicGroupId())));
 					}else {
 						result.setCourseScheduleType(result.getType().getMsg());
 					}

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",
-                    "groupType.desc", "teachMode.msg", "schoolName", "status.msg", "teacherName",  "teachingUserNames",
+                    "courseScheduleType", "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

@@ -4214,12 +4214,12 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			musicGroupEchelonDataDtoList.addAll(v);
 			for (String musicGroupId : musicGroupEchelonDataDtoListMap.keySet()) {
 				musicGroupEchelonDataDtoList.addAll(musicGroupEchelonDataDtoListMap.get(musicGroupId));
-				musicGroupEchelonDataDtoList = musicGroupEchelonDataMap.get(musicGroupId);
-				if(CollectionUtils.isEmpty(musicGroupEchelonDataDtoList)){
-					continue;
+				List<ExportMusicGroupEchelonDataDto> dtos1 = musicGroupEchelonDataMap.get(musicGroupId);
+				if(CollectionUtils.isNotEmpty(dtos1)){
+					musicGroupEchelonDataDtoList.addAll(dtos1);
 				}
-				musicGroupEchelonDataDtoList.add(new ExportMusicGroupEchelonDataDto());
 			}
+			musicGroupEchelonDataDtoList.add(new ExportMusicGroupEchelonDataDto());
 			resultMap.put(coopName,musicGroupEchelonDataDtoList);
 		});
 		return resultMap;

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

@@ -293,16 +293,22 @@ public class POIUtil {
 		for (K k : dataMap.keySet()) {
 			List<V> dataset = dataMap.get(k);
 			HSSFSheet sheet = workbook.createSheet(); // 创建sheet
+			//设置sheet名称
+			workbook.setSheetName(index, k.toString());
 			// 设置表头
 			// 创建第一行
 			//创建合并单元格
-			HSSFCell cell0 = sheet.createRow(0).createCell(0);
-			cell0.setCellStyle(style);
-			cell0.setCellType(HSSFCell.CELL_TYPE_STRING);
+			HSSFRow row0 = sheet.createRow(0);
+			HSSFCell cell0 = null;
+			for (int i = 0; i < headColumns.length; i++) {
+				// 创建列
+				cell0 = row0.createCell(i);
+				// 定义单元格为字符串类型
+				cell0.setCellType(HSSFCell.CELL_TYPE_STRING);
+				// 设置单元格的样式
+				cell0.setCellStyle(style);
+			}
 			sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 10));
-			sheet.getRow(0).getCell(1).setCellValue(k.toString());
-			//设置sheet名称
-			workbook.setSheetName(index, k.toString());
 			HSSFRow row1 = sheet.createRow(1);
 			HSSFCell cell = null;
 			for (int i = 0; i < headColumns.length; i++) {