经营报表导出

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

@@ -2322,15 +2322,15 @@ public class ExportServiceImpl implements ExportService {
             feeByTypeMap = feeByType.stream().collect(Collectors.groupingBy(StudentPaymentOrderExportDto::getId));
             childRepairMap = MapUtil.convertIntegerMap(sellOrderDao.queryChildRepair(otherOrderIds));
         }
+        List<Integer> organIds = studentPaymentOrderExportDtos.stream().map(e -> e.getOrganId()).distinct().collect(Collectors.toList());
+        Map<Integer, String> userOrganNameMap = organizationService.getMap("organization","id_","name_",organIds,TenantContextHolder.getTenantId(),Integer.class,String.class);
         //按分部分组
         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);
-            StudentPaymentOrderExportDto dto = orderExportDtos.get(0);
-            incomeDto.setOrganName(dto.getOrganName());
-            for (StudentPaymentOrderExportDto row : orderExportDtos) {
+            incomeDto.setOrganName(userOrganNameMap.get(organId));
+            for (StudentPaymentOrderExportDto row : listMap.get(organId)) {
                 if (row.getActualAmount() == null) {
                     row.setActualAmount(BigDecimal.ZERO);
                 }