乐团梯队数据导出

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/VipGroupDao.java

@@ -398,5 +398,5 @@ public interface VipGroupDao extends BaseDAO<Long, VipGroup> {
 
     void del(@Param("id") Integer id);
 
-    List<Map<String, String>> findVipGroupTypeMaps(@Param("vipGroupIds") List<Long> vipGroupIds);
+    List<Map<Long, String>> findVipGroupTypeMaps(@Param("vipGroupIds") List<Long> vipGroupIds);
 }

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

@@ -4475,7 +4475,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 		List<Map<Integer, String>> classGroupSubjectNameMaps = classGroupDao.findClassGroupSubjectNameMaps(courseScheduleIds);
 		Map<Integer, String> classGroupSubjectNameMap = MapUtil.convertIntegerMap(classGroupSubjectNameMaps);
 		Map<String, MusicGroupBasicDto> cooperationMap = new HashMap<>();
-		Map<String, String> vipGroupTypeMap = new HashMap<>();
+		Map<Long, String> vipGroupTypeMap = new HashMap<>();
 		List<Long> musicCourseIds = results.stream().filter(e -> e.getGroupType() == MUSIC).map(CourseScheduleEndDto::getId).collect(Collectors.toList());
 		Map<Long, String> eduName = new HashMap<>(courseScheduleIds.size());
 		if (musicCourseIds != null && musicCourseIds.size() > 0) {
@@ -4503,7 +4503,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 
 		for (CourseScheduleEndDto result : results) {
 			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/MusicGroupServiceImpl.java

@@ -4211,7 +4211,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			Map<String, List<ExportMusicGroupEchelonDataDto>> musicGroupEchelonDataDtoListMap =
 					dtos.stream().collect(Collectors.groupingBy(ExportMusicGroupEchelonDataDto::getMusicGroupId));
 			List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = new ArrayList<>();
+			musicGroupEchelonDataDtoList.addAll(v);
 			for (String musicGroupId : musicGroupEchelonDataDtoListMap.keySet()) {
+				musicGroupEchelonDataDtoList.addAll(musicGroupEchelonDataDtoListMap.get(musicGroupId));
 				musicGroupEchelonDataDtoList = musicGroupEchelonDataMap.get(musicGroupId);
 				if(CollectionUtils.isEmpty(musicGroupEchelonDataDtoList)){
 					continue;

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

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