|
@@ -211,7 +211,6 @@ public class ExportServiceImpl implements ExportService {
|
|
|
for (int i = 0; i < headColumns.size(); i++) {
|
|
|
headMap.put(headColumns.get(i), fieldColumns.get(i));
|
|
|
}
|
|
|
-// headMap.keySet().removeAll(org.apache.commons.collections.CollectionUtils.subtract(headColumns, fieldColumns));
|
|
|
return headMap;
|
|
|
}
|
|
|
|
|
@@ -386,6 +385,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_OA_SUMMARY_EXPENSES_DETAIL, info -> exportOaSummaryExpensesDetail(info));
|
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_OPERATING_SUMMARY_INCOME, info -> exportOperatingSummaryIncome(info));
|
|
|
exportManageFuncMap.put(ExportEnum.EXPORT_COURSE_INCOME, (info) -> exportCourseIncome(info));
|
|
|
+ exportManageFuncMap.put(ExportEnum.EXPORT_MUSIC_GROUP_ECHELON_DATA, (info) -> exportMusicGroupEchelonData(info));
|
|
|
|
|
|
}
|
|
|
|
|
@@ -420,6 +420,12 @@ public class ExportServiceImpl implements ExportService {
|
|
|
return succeed;
|
|
|
}
|
|
|
|
|
|
+ private HttpResponseResult exportMusicGroupEchelonData(Map<String, Object> info){
|
|
|
+ String organId = getParam(info, "organId", String.class);
|
|
|
+ ManagerDownload managerDownload = this.saveManagerDownload(ExportTypeEnum.EXPORT_MUSIC_GROUP_ECHELON_DATA, sysUserService.getUserId());
|
|
|
+ return this.asyncExport(() -> this.musicGroupEchelonData(organId, managerDownload), managerDownload.getName());
|
|
|
+ }
|
|
|
+
|
|
|
private HttpResponseResult exportOperatingSummaryIncome(Map<String, Object> info) {
|
|
|
String month = getParam(info, "month", String.class);
|
|
|
Map<String, Object> params = new HashMap<>(1);
|
|
@@ -2329,6 +2335,17 @@ 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)));
|
|
|
+ }
|
|
|
+ Map<Integer, List<ExportMusicGroupEchelonDataDto>> dtos = musicGroupService.queryMusicGroupEchelonData(organIds);
|
|
|
+ HSSFWorkbook workbook = getHSSFWorkbook(dtos, ExportEnum.EXPORT_MUSIC_GROUP_ECHELON_DATA);
|
|
|
+ exportManagerDownload(workbook, managerDownload);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
public void operatingSummaryIncome(Map<String, Object> params, ManagerDownload managerDownload) {
|
|
|
List<OperatingTotalIncomeDto> incomeDtos = studentPaymentOrderService.queryOperatingSummaryIncome(params);
|
|
|
HSSFWorkbook workbook = getHSSFWorkbook(incomeDtos, ExportEnum.EXPORT_OPERATING_SUMMARY_INCOME);
|
|
@@ -3007,6 +3024,17 @@ public class ExportServiceImpl implements ExportService {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ public <K,V> HSSFWorkbook getHSSFWorkbook(Map<K,List<V>> rows,ExportEnum exportEnum) {
|
|
|
+ try {
|
|
|
+ Map<String, String> headMap = getExportMap(new ExportDto(exportEnum));
|
|
|
+ String[] header = headMap.keySet().toArray(new String[headMap.keySet().size()]);
|
|
|
+ String[] body = headMap.values().toArray(new String[headMap.keySet().size()]);
|
|
|
+ return POIUtil.exportExcel(header, body, rows);
|
|
|
+ } catch (Exception e) {
|
|
|
+ throw new BizException(e);
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
public void exportManagerDownload(HSSFWorkbook workbook, ManagerDownload managerDownload) {
|
|
|
String basePath = new ApplicationHome(this.getClass()).getSource().getParentFile().getPath();
|
|
|
File file = new File(basePath + "/" + managerDownload.getName());
|
|
@@ -3018,7 +3046,6 @@ public class ExportServiceImpl implements ExportService {
|
|
|
fileOutputStream.close();
|
|
|
|
|
|
String folder = "daya/download/" + UploadUtil.getFileFloder();
|
|
|
- //String url = storagePluginContext.uploadFile(KS3StoragePlugin.PLUGIN_NAME, folder, file);
|
|
|
String url = ossPluginContext.getPluginService(TencentOssPlugin.PLUGIN_NAME).uploadFile(folder, file);
|
|
|
//把记录插入下载表
|
|
|
managerDownload.setFileUrl(url);
|