乐团梯队数据导出

mec-biz/src/main/java/com/ym/mec/biz/service/MusicGroupService.java

@@ -483,5 +483,5 @@ public interface MusicGroupService extends BaseService<String, MusicGroup> {
      */
     List<Subject> getSubjectListByIdAndCoopId(String musicGroupId, Integer coopId);
 
-    Map<Integer, List<ExportMusicGroupEchelonDataDto>> queryMusicGroupEchelonData(List<Integer> organIds);
+    Map<String, List<ExportMusicGroupEchelonDataDto>> queryMusicGroupEchelonData(List<Integer> organIds);
 }

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

@@ -2340,7 +2340,7 @@ public class ExportServiceImpl implements ExportService {
         if(StringUtils.isNotEmpty(organId)){
             Arrays.stream(organId.split(",")).forEach(e->organIds.add(Integer.parseInt(e)));
         }
-        Map<Integer, List<ExportMusicGroupEchelonDataDto>> dtos = musicGroupService.queryMusicGroupEchelonData(organIds);
+        Map<String, List<ExportMusicGroupEchelonDataDto>> dtos = musicGroupService.queryMusicGroupEchelonData(organIds);
         HSSFWorkbook workbook = getHSSFWorkbook(dtos, ExportEnum.EXPORT_MUSIC_GROUP_ECHELON_DATA);
         exportManagerDownload(workbook, managerDownload);
     }

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

@@ -4188,7 +4188,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
     }
 
 	@Override
-	public Map<Integer, List<ExportMusicGroupEchelonDataDto>> queryMusicGroupEchelonData(List<Integer> organIds) {
+	public Map<String, List<ExportMusicGroupEchelonDataDto>> queryMusicGroupEchelonData(List<Integer> organIds) {
 		List<ExportMusicGroupEchelonDataDto> coopEchelonDataDtos = musicGroupDao.queryCoopEchelonData(organIds);
 		if(CollectionUtils.isEmpty(coopEchelonDataDtos)){
 			return new HashMap<>();
@@ -4203,10 +4203,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 		//按合作单位分组
 		Map<Integer, List<ExportMusicGroupEchelonDataDto>> coopEchelonDataMap =
 				coopEchelonDataDtos.stream().collect(Collectors.groupingBy(ExportMusicGroupEchelonDataDto::getCoopId));
+		Map<String, List<ExportMusicGroupEchelonDataDto>> resultMap = new HashMap<>();
 		coopEchelonDataMap.forEach((k,v) -> {
+			List<ExportMusicGroupEchelonDataDto> dtos = coopEchelonDataMap.get(k);
+			String coopName = dtos.get(0).getCoopName();
 			//按乐团编号分组
 			Map<String, List<ExportMusicGroupEchelonDataDto>> musicGroupEchelonDataDtoListMap =
-					coopEchelonDataMap.get(k).stream().collect(Collectors.groupingBy(ExportMusicGroupEchelonDataDto::getMusicGroupId));
+					dtos.stream().collect(Collectors.groupingBy(ExportMusicGroupEchelonDataDto::getMusicGroupId));
 			musicGroupEchelonDataDtoListMap.forEach((k1,v1) -> {
 				List<ExportMusicGroupEchelonDataDto> musicGroupEchelonDataDtoList = musicGroupEchelonDataMap.get(k1);
 				if(CollectionUtils.isNotEmpty(musicGroupEchelonDataDtoList)){
@@ -4215,8 +4218,9 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				//插入一条空白行数据
 				v1.add(new ExportMusicGroupEchelonDataDto());
 			});
+			resultMap.put(coopName,v);
 		});
-		return coopEchelonDataMap;
+		return resultMap;
 	}
 
 	@Override

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

@@ -289,6 +289,7 @@ public class POIUtil {
 		font.setBoldweight(HSSFFont.BOLDWEIGHT_BOLD);
 		style.setFont(font);
 
+		int index = 0;
 		for (K k : dataMap.keySet()) {
 			List<V> dataset = dataMap.get(k);
 			HSSFSheet sheet = workbook.createSheet(); // 创建sheet
@@ -298,7 +299,7 @@ public class POIUtil {
 			sheet.addMergedRegion(new CellRangeAddress(0, 0, 0, 10));
 			sheet.getRow(0).getCell(1).setCellValue(k.toString());
 			//设置sheet名称
-			workbook.setSheetName(workbook.getSheetIndex(sheet), k.toString());
+			workbook.setSheetName(index, k.toString());
 			HSSFRow row1 = sheet.createRow(1);
 			HSSFCell cell = null;
 			for (int i = 0; i < headColumns.length; i++) {
@@ -352,6 +353,7 @@ public class POIUtil {
 					}
 				}
 			}
+			index++;
 		}
 		return workbook;
 	}