|
@@ -2345,7 +2345,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal subsidy = monthIncomeMapList.stream().map(LocalDateBigDecimalMapDto::getSubsidy).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
|
|
|
result.put("total", reduce.add(subsidy));
|
|
|
- salaryResult.put("salary", reduce);
|
|
|
+ salaryResult.put("amount", reduce);
|
|
|
salaryResult.put("data", monthIncomeMapList);
|
|
|
|
|
|
List<LocalDateBigDecimalMapDto> subsidyList = new ArrayList<>();
|
|
@@ -2361,10 +2361,12 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
subsidyList.add(subsidyData);
|
|
|
|
|
|
LocalDateBigDecimalMapDto saleRewardData = new LocalDateBigDecimalMapDto();
|
|
|
+ BeanUtils.copyProperties(localDateBigDecimalMapDto, saleRewardData);
|
|
|
saleRewardData.setAmount(BigDecimal.ZERO);
|
|
|
saleRewardList.add(saleRewardData);
|
|
|
}
|
|
|
|
|
|
+ subsidyResult.put("amount", subsidy);
|
|
|
subsidyResult.put("data", subsidyList);
|
|
|
|
|
|
saleRewardResult.put("data", saleRewardList);
|