Forráskód Böngészése

feat:教师端课酬

Joburgess 4 éve
szülő
commit
9db13bc7e4

+ 2 - 1
mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleTeacherSalaryDao.java

@@ -544,7 +544,8 @@ public interface CourseScheduleTeacherSalaryDao extends BaseDAO<Long, CourseSche
 													@Param("startDay") String startDay,
 													@Param("endDay") String endDay,
 													@Param("startClassDay") String startClassDay,
-													@Param("courseStatus") CourseStatusEnum courseStatus);
+													@Param("courseStatus") CourseStatusEnum courseStatus,
+													@Param("teachIncomeType") String teachIncomeType);
 
 	/**
 	 * @describe 教师年度收入统计

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

@@ -2055,7 +2055,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             return teacherSalaryOverview;
         }
 
-        TeacherIncomeReviewDto teacherSalaryOverview = courseScheduleTeacherSalaryDao.getTeacherSalaryOverview(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), "2021-03-01", null);
+        TeacherIncomeReviewDto teacherSalaryOverview = courseScheduleTeacherSalaryDao.getTeacherSalaryOverview(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), "2021-03-01", null, queryInfo.getTeachIncomeType());
         if(Objects.isNull(teacherSalaryOverview)){
             teacherSalaryOverview = new TeacherIncomeReviewDto();
         }