|
@@ -2324,6 +2324,7 @@ public class ExportServiceImpl implements ExportService {
|
|
|
}
|
|
|
//按分部分组
|
|
|
Map<Integer, List<StudentPaymentOrderExportDto>> listMap = studentPaymentOrderExportDtos.stream().collect(Collectors.groupingBy(e -> e.getOrganId()));
|
|
|
+ List<OperatingTotalIncomeDto> incomeDtos = new ArrayList<>();
|
|
|
for (Integer organId : listMap.keySet()) {
|
|
|
OperatingTotalIncomeDto incomeDto = new OperatingTotalIncomeDto();
|
|
|
List<StudentPaymentOrderExportDto> orderExportDtos = listMap.get(organId);
|
|
@@ -2571,8 +2572,9 @@ public class ExportServiceImpl implements ExportService {
|
|
|
.add(incomeDto.getLargeInstruments())
|
|
|
);
|
|
|
}
|
|
|
+ incomeDtos.add(incomeDto);
|
|
|
}
|
|
|
- HSSFWorkbook workbook = getHSSFWorkbook(studentPaymentOrderExportDtos, ExportEnum.EXPORT_OPERATING_SUMMARY_INCOME);
|
|
|
+ HSSFWorkbook workbook = getHSSFWorkbook(incomeDtos, ExportEnum.EXPORT_OPERATING_SUMMARY_INCOME);
|
|
|
exportManagerDownload(workbook, managerDownload);
|
|
|
}
|
|
|
|