|
@@ -2333,9 +2333,8 @@ public class ExportServiceImpl implements ExportService {
|
|
List<Map<Integer, BigDecimal>> personIncomeMapList = cloudTeacherOrderDao.sumPersonIncome(params.get("month").toString());
|
|
List<Map<Integer, BigDecimal>> personIncomeMapList = cloudTeacherOrderDao.sumPersonIncome(params.get("month").toString());
|
|
Map<Integer, BigDecimal> personIncomeMap = new HashMap<>();
|
|
Map<Integer, BigDecimal> personIncomeMap = new HashMap<>();
|
|
if(!CollectionUtils.isEmpty(personIncomeMapList)){
|
|
if(!CollectionUtils.isEmpty(personIncomeMapList)){
|
|
- personIncomeMap = personIncomeMapList.stream().collect(Collectors.toMap(s -> Integer.parseInt(s.get("key").toString()), s -> BigDecimal.valueOf(Double.parseDouble(s.get("value").toString()))));
|
|
|
|
|
|
+ personIncomeMap = MapUtil.convertIntegerMap(personIncomeMapList);
|
|
}
|
|
}
|
|
-
|
|
|
|
for (Integer organId : listMap.keySet()) {
|
|
for (Integer organId : listMap.keySet()) {
|
|
OperatingTotalIncomeDto incomeDto = new OperatingTotalIncomeDto();
|
|
OperatingTotalIncomeDto incomeDto = new OperatingTotalIncomeDto();
|
|
incomeDto.setOrganName(userOrganNameMap.get(organId));
|
|
incomeDto.setOrganName(userOrganNameMap.get(organId));
|