|
@@ -1977,6 +1977,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
if(Objects.isNull(teacherSalaryOverview)){
|
|
if(Objects.isNull(teacherSalaryOverview)){
|
|
teacherSalaryOverview = new TeacherIncomeReviewDto();
|
|
teacherSalaryOverview = new TeacherIncomeReviewDto();
|
|
}
|
|
}
|
|
|
|
+ if(BigDecimal.ZERO.compareTo(teacherSalaryOverview.getThisMonthExpectIncome())>0){
|
|
|
|
+ teacherSalaryOverview.setThisMonthExpectIncome(BigDecimal.ZERO);
|
|
|
|
+ }
|
|
|
|
|
|
List<CourseSchedule> teacherCourses = courseScheduleDao.getTeacherCourseWithClassDate(teacherId, monthFirstDay.toString(), monthLastDay.toString(), CourseStatusEnum.OVER);
|
|
List<CourseSchedule> teacherCourses = courseScheduleDao.getTeacherCourseWithClassDate(teacherId, monthFirstDay.toString(), monthLastDay.toString(), CourseStatusEnum.OVER);
|
|
if(CollectionUtils.isEmpty(teacherCourses)){
|
|
if(CollectionUtils.isEmpty(teacherCourses)){
|
|
@@ -2139,6 +2142,9 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
|
|
teacherIncomeInfo.setTeacherAttendance(teacherAttendances.get(0));
|
|
teacherIncomeInfo.setBelongToDaya(teacherSalary.getBelongToDaya());
|
|
teacherIncomeInfo.setBelongToDaya(teacherSalary.getBelongToDaya());
|
|
teacherIncomeInfo.setExpectIncome(teacherIncomeInfo.getExpectSalary().add(teacherIncomeInfo.getSubsidy()));
|
|
teacherIncomeInfo.setExpectIncome(teacherIncomeInfo.getExpectSalary().add(teacherIncomeInfo.getSubsidy()));
|
|
|
|
+ if(BigDecimal.ZERO.compareTo(teacherIncomeInfo.getExpectIncome())>0){
|
|
|
|
+ teacherIncomeInfo.setExpectIncome(BigDecimal.ZERO);
|
|
|
|
+ }
|
|
dataList.add(teacherIncomeInfo);
|
|
dataList.add(teacherIncomeInfo);
|
|
}
|
|
}
|
|
}
|
|
}
|