|
@@ -1932,7 +1932,7 @@ public class StudentPaymentOrderServiceImpl extends BaseServiceImpl<Long, Studen
|
|
|
Map<Integer, BigDecimal> personalCloudAmount = MapUtil.convertIntegerMap(cloudTeacherOrderService.getDao().sumPersonalCloudAmount(month,firstDayOfMonth,lastDayOfMonth));
|
|
|
List<Map> courseFeeStat = courseScheduleStudentPaymentDao.statCourseFee(cutFirstDayOfMonth,cutLastDayOfMonth);
|
|
|
Map<Integer, BigDecimal> courseIncome = courseFeeStat.stream().collect(Collectors.toMap(s -> Integer.parseInt(s.get("key").toString()), s -> BigDecimal.valueOf(Double.parseDouble(s.get("value").toString()))));
|
|
|
- for (Integer organId : listMap.keySet()) {
|
|
|
+ for (Integer organId : userOrganNameMap.keySet()) {
|
|
|
OperatingTotalIncomeDto incomeDto = new OperatingTotalIncomeDto();
|
|
|
incomeDto.setOrganId(organId);
|
|
|
incomeDto.setOrganName(userOrganNameMap.get(organId));
|