|
@@ -1968,6 +1968,19 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
BigDecimal monthActualIncome = teacherSalaries.stream().map(CourseScheduleTeacherSalary::getActualSalary).reduce(BigDecimal.ZERO, BigDecimal::add);
|
|
|
teacherSalaryOverview.setThisMonthActualIncome(monthActualIncome);
|
|
|
|
|
|
+ SysConfig dayaBaseSalaryAmountConfig = sysConfigService.findByParamName(SysConfigService.DAYA_BASE_SALARY_AMOUNT);
|
|
|
+ BigDecimal dayaBaseSalaryAmount = new BigDecimal(4000);
|
|
|
+ if(Objects.nonNull(dayaBaseSalaryAmountConfig)&&StringUtils.isNotBlank(dayaBaseSalaryAmountConfig.getParanValue())){
|
|
|
+ dayaBaseSalaryAmount = new BigDecimal(dayaBaseSalaryAmountConfig.getParanValue());
|
|
|
+ }
|
|
|
+
|
|
|
+ if(monthActualIncome.compareTo(dayaBaseSalaryAmount)>0){
|
|
|
+ teacherSalaryOverview.setDayaIncome(dayaBaseSalaryAmount);
|
|
|
+ teacherSalaryOverview.setOtherIncome(monthActualIncome.subtract(dayaBaseSalaryAmount));
|
|
|
+ }else{
|
|
|
+ teacherSalaryOverview.setDayaIncome(monthActualIncome);
|
|
|
+ }
|
|
|
+
|
|
|
return teacherSalaryOverview;
|
|
|
}
|
|
|
|