|
@@ -2062,6 +2062,14 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
return teacherSalaryOverview;
|
|
|
}
|
|
|
|
|
|
+ if(StringUtils.isBlank(queryInfo.getStartDay())){
|
|
|
+ LocalDate nowDate = LocalDate.now();
|
|
|
+ LocalDate monthFirstDay = nowDate.with(TemporalAdjusters.firstDayOfMonth());
|
|
|
+ LocalDate monthLastDay = nowDate.with(TemporalAdjusters.lastDayOfMonth());
|
|
|
+ queryInfo.setStartDay(monthFirstDay.toString());
|
|
|
+ queryInfo.setEndDay(monthLastDay.toString());
|
|
|
+ }
|
|
|
+
|
|
|
TeacherIncomeReviewDto teacherSalaryOverview = courseScheduleTeacherSalaryDao.getTeacherSalaryOverview(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), "2021-03-01", null, queryInfo.getTeachIncomeType());
|
|
|
if(Objects.isNull(teacherSalaryOverview)){
|
|
|
teacherSalaryOverview = new TeacherIncomeReviewDto();
|