Sfoglia il codice sorgente

feat:教师端课酬

Joburgess 4 anni fa
parent
commit
6244f51513

+ 8 - 0
mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -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();

+ 3 - 3
mec-teacher/src/main/java/com/ym/mec/teacher/controller/CourseScheduleTeacherSalaryController.java

@@ -91,9 +91,9 @@ public class CourseScheduleTeacherSalaryController extends BaseController {
         }
         queryInfo.setTeacherId(sysUser.getId());
         queryInfo.setCourseStatus(CourseStatusEnum.OVER);
-        if(StringUtils.isBlank(queryInfo.getStartDay())){
-            queryInfo.setStartDay("2021-03-01");
-        }
+//        if(StringUtils.isBlank(queryInfo.getStartDay())){
+//            queryInfo.setStartDay("2021-03-01");
+//        }
         return succeed(courseScheduleTeacherSalaryService.getTeacherSalaryOverview(queryInfo));
     }