|
@@ -422,8 +422,16 @@ public class ExportServiceImpl implements ExportService {
|
|
|
|
|
|
private HttpResponseResult exportMusicGroupEchelonData(Map<String, Object> info){
|
|
|
String organId = getParam(info, "organId", String.class);
|
|
|
+ List<Integer> organIds = new ArrayList<>();
|
|
|
+ if(StringUtils.isNotEmpty(organId)){
|
|
|
+ Arrays.stream(organId.split(",")).forEach(e->organIds.add(Integer.parseInt(e)));
|
|
|
+ }
|
|
|
+ List<ExportMusicGroupEchelonDataDto> coopEchelonDataDtos = musicGroupDao.queryCoopEchelonData(organIds);
|
|
|
+ if(org.apache.commons.collections.CollectionUtils.isEmpty(coopEchelonDataDtos)){
|
|
|
+ throw new BizException("没有可导出的数据");
|
|
|
+ }
|
|
|
ManagerDownload managerDownload = this.saveManagerDownload(ExportTypeEnum.EXPORT_MUSIC_GROUP_ECHELON_DATA, sysUserService.getUserId());
|
|
|
- return this.asyncExport(() -> this.musicGroupEchelonData(organId, managerDownload), managerDownload.getName());
|
|
|
+ return this.asyncExport(() -> this.musicGroupEchelonData(organIds, managerDownload), managerDownload.getName());
|
|
|
}
|
|
|
|
|
|
private HttpResponseResult exportOperatingSummaryIncome(Map<String, Object> info) {
|
|
@@ -2335,11 +2343,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void musicGroupEchelonData(String organId, ManagerDownload managerDownload) {
|
|
|
- List<Integer> organIds = new ArrayList<>();
|
|
|
- if(StringUtils.isNotEmpty(organId)){
|
|
|
- Arrays.stream(organId.split(",")).forEach(e->organIds.add(Integer.parseInt(e)));
|
|
|
- }
|
|
|
+ public void musicGroupEchelonData(List<Integer> organIds, ManagerDownload managerDownload) {
|
|
|
Map<String, List<ExportMusicGroupEchelonDataDto>> dtos = musicGroupService.queryMusicGroupEchelonData(organIds);
|
|
|
HSSFWorkbook workbook = getHSSFWorkbook(dtos, ExportEnum.EXPORT_MUSIC_GROUP_ECHELON_DATA);
|
|
|
exportManagerDownload(workbook, managerDownload);
|