|
@@ -19,170 +19,169 @@ import java.util.Map;
|
|
|
|
|
|
public interface CourseScheduleService extends BaseService<Long, CourseSchedule> {
|
|
|
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/10
|
|
|
- * 根据课程ID获取当前课程的信息
|
|
|
- */
|
|
|
- TeacherAttendanceDto getCurrentCourseDetail(Long courseID);
|
|
|
-
|
|
|
- /**
|
|
|
- * @describe 根据课程编号删除课程计划及对应的学生缴费、教师课酬记录
|
|
|
- * @author Joburgess
|
|
|
- * @date 2019/10/31
|
|
|
- * @param courseScheduleIds:
|
|
|
- * @return int
|
|
|
- */
|
|
|
- void deleteCourseSchedules(List<Long> courseScheduleIds);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/10/16
|
|
|
- * @params [teacherAttendanceDto, userId]
|
|
|
- * @return YesOrNoEnum
|
|
|
- * @describe 判断该课程是否只能进行正常签到
|
|
|
- */
|
|
|
- YesOrNoEnum enableOnlyNormalAttendance(TeacherAttendanceDto teacherAttendanceDto, Long userId);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 批量插入课程计划
|
|
|
- */
|
|
|
- void batchAddCourseSchedule(List<CourseSchedule> courseSchedules);
|
|
|
-
|
|
|
- /**
|
|
|
- * @describe 创建乐团课课程计划
|
|
|
- * @author Joburgess
|
|
|
- * @date 2019/10/24
|
|
|
- * @param courseSchedules: 课程计划列表
|
|
|
- * @return void
|
|
|
- */
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/10
|
|
|
+ * 根据课程ID获取当前课程的信息
|
|
|
+ */
|
|
|
+ TeacherAttendanceDto getCurrentCourseDetail(Long courseID);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @describe 根据课程编号删除课程计划及对应的学生缴费、教师课酬记录
|
|
|
+ * @author Joburgess
|
|
|
+ * @date 2019/10/31
|
|
|
+ * @param courseScheduleIds:
|
|
|
+ * @return int
|
|
|
+ */
|
|
|
+ void deleteCourseSchedules(List<Long> courseScheduleIds);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/10/16
|
|
|
+ * @params [teacherAttendanceDto, userId]
|
|
|
+ * @return YesOrNoEnum
|
|
|
+ * @describe 判断该课程是否只能进行正常签到
|
|
|
+ */
|
|
|
+ YesOrNoEnum enableOnlyNormalAttendance(TeacherAttendanceDto teacherAttendanceDto, Long userId);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 批量插入课程计划
|
|
|
+ */
|
|
|
+ void batchAddCourseSchedule(List<CourseSchedule> courseSchedules);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @describe 创建乐团课课程计划
|
|
|
+ * @author Joburgess
|
|
|
+ * @date 2019/10/24
|
|
|
+ * @param courseSchedules: 课程计划列表
|
|
|
+ * @return void
|
|
|
+ */
|
|
|
void createCourseSchedules(List<CourseSchedule> courseSchedules);
|
|
|
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 批量更新课程计划
|
|
|
- */
|
|
|
- void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules,Long musicGroupID);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 根据日期获取当日排课信息
|
|
|
- */
|
|
|
- List<CourseScheduleDto> getCourseSchedulesWithDate(Date classDate);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 根据日期获取当日排课信息
|
|
|
- */
|
|
|
- Map getStudentCourseSchedulesWithDate(Date classDate);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 根据日期获取当日排课信息
|
|
|
- */
|
|
|
- List<CourseScheduleDto> getTeacherCourseSchedulesWithDate(Integer userId,Date classDate,String type);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 根据日期获取当日排课信息
|
|
|
- */
|
|
|
- PageInfo getCourseSchedulesWithDateByEdu(CourseScheduleQueryInfo queryInfo);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 根据月份获取乐团在该月有课的日期
|
|
|
- */
|
|
|
- List<Date> getCourseScheduleDateByMonth(Long musicGroupID, Date month);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 根据学生获取乐团在该月有课的日期
|
|
|
- */
|
|
|
- List<Date> getCourseScheduleDateByStudent(Date month, Integer isAttend);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/17
|
|
|
- * 获取教师在该月有课的日期
|
|
|
- */
|
|
|
- List<Date> getCourseScheduleDateByTeacher(Date month,String type);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/10/11
|
|
|
- * @params [month]
|
|
|
- * @return java.util.List<java.util.Date>
|
|
|
- * @describe 获取
|
|
|
- */
|
|
|
- List<Date> getCourseScheduleDates(Date month);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/23
|
|
|
- * 课时调整
|
|
|
- */
|
|
|
- void classStartDateAdjust(List<CourseSchedule> newCourseSchedules);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/24
|
|
|
- * 课程交换
|
|
|
- */
|
|
|
- void courseSwap(Long courseScheduleId1,Long courseScheduleId2);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/10/14
|
|
|
- * @params [day1, day2]
|
|
|
- * @return void
|
|
|
- * @describe 对调两天的课程
|
|
|
- */
|
|
|
- void courseSwapWithDay(Date day1,Date day2);
|
|
|
-
|
|
|
- /**
|
|
|
- * @describe 检测数据库不存在的课程是否存在错误
|
|
|
- * @author Joburgess
|
|
|
- * @date 2019/10/31
|
|
|
- * @param courseSchedules: 课程列表
|
|
|
- * @return void
|
|
|
- */
|
|
|
- void checkNewCourseSchedules(List<CourseSchedule> courseSchedules);
|
|
|
-
|
|
|
- /**
|
|
|
- * 获取班级未开始的课程计划
|
|
|
- *
|
|
|
- * @param classGroupTeacherMapperList
|
|
|
- * @return
|
|
|
- */
|
|
|
- List<CourseSchedule> findClassGroupNoStartCourseSchedules(List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
|
|
|
-
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/9/30
|
|
|
- * 获取学生上课记录
|
|
|
- */
|
|
|
- Object findStudentCourseScheduleRecords(StudentCourseScheduleRecordQueryInfo queryInfo);
|
|
|
-
|
|
|
- /**
|
|
|
- * @Author: Joburgess
|
|
|
- * @Date: 2019/10/3
|
|
|
- * @params [courseScheduleComplaints]
|
|
|
- * @return void
|
|
|
- * @describe 课程投诉
|
|
|
- */
|
|
|
- void courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints);
|
|
|
-
|
|
|
- /**
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 批量更新课程计划
|
|
|
+ */
|
|
|
+ void batchUpdateCourseSchedule(List<CourseSchedule> courseSchedules, Long musicGroupID);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 根据日期获取当日排课信息
|
|
|
+ */
|
|
|
+ List<CourseScheduleDto> getCourseSchedulesWithDate(Date classDate);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 根据日期获取当日排课信息
|
|
|
+ */
|
|
|
+ Map getStudentCourseSchedulesWithDate(Date classDate);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 根据日期获取当日排课信息
|
|
|
+ */
|
|
|
+ List<CourseScheduleDto> getTeacherCourseSchedulesWithDate(Integer userId, Date classDate, String type);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 根据日期获取当日排课信息
|
|
|
+ */
|
|
|
+ PageInfo getCourseSchedulesWithDateByEdu(CourseScheduleQueryInfo queryInfo);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 根据月份获取乐团在该月有课的日期
|
|
|
+ */
|
|
|
+ List<Date> getCourseScheduleDateByMonth(Long musicGroupID, Date month);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 根据学生获取乐团在该月有课的日期
|
|
|
+ */
|
|
|
+ List<Date> getCourseScheduleDateByStudent(Date month, Integer isAttend);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/17
|
|
|
+ * 获取教师在该月有课的日期
|
|
|
+ */
|
|
|
+ List<Date> getCourseScheduleDateByTeacher(Date month, String type);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/10/11
|
|
|
+ * @params [month]
|
|
|
+ * @return java.util.List<java.util.Date>
|
|
|
+ * @describe 获取
|
|
|
+ */
|
|
|
+ List<Date> getCourseScheduleDates(Date month);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/23
|
|
|
+ * 课时调整
|
|
|
+ */
|
|
|
+ void classStartDateAdjust(List<CourseSchedule> newCourseSchedules);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/24
|
|
|
+ * 课程交换
|
|
|
+ */
|
|
|
+ void courseSwap(Long courseScheduleId1, Long courseScheduleId2);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/10/14
|
|
|
+ * @params [day1, day2]
|
|
|
+ * @return void
|
|
|
+ * @describe 对调两天的课程
|
|
|
+ */
|
|
|
+ void courseSwapWithDay(Date day1, Date day2);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @describe 检测数据库不存在的课程是否存在错误
|
|
|
+ * @author Joburgess
|
|
|
+ * @date 2019/10/31
|
|
|
+ * @param courseSchedules: 课程列表
|
|
|
+ * @return void
|
|
|
+ */
|
|
|
+ void checkNewCourseSchedules(List<CourseSchedule> courseSchedules);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 获取班级未开始的课程计划
|
|
|
+ *
|
|
|
+ * @param classGroupTeacherMapperList
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ List<CourseSchedule> findClassGroupNoStartCourseSchedules(List<ClassGroupTeacherMapper> classGroupTeacherMapperList);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/9/30
|
|
|
+ * 获取学生上课记录
|
|
|
+ */
|
|
|
+ Object findStudentCourseScheduleRecords(StudentCourseScheduleRecordQueryInfo queryInfo);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * @Author: Joburgess
|
|
|
+ * @Date: 2019/10/3
|
|
|
+ * @params [courseScheduleComplaints]
|
|
|
+ * @return void
|
|
|
+ * @describe 课程投诉
|
|
|
+ */
|
|
|
+ void courseScheduleCommplaint(CourseScheduleComplaints courseScheduleComplaints);
|
|
|
+
|
|
|
+ /**
|
|
|
* @Author: Joburgess
|
|
|
* @Date: 2019/10/3
|
|
|
* @params [id] 申诉编号
|
|
@@ -193,12 +192,12 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
|
|
|
* @describe 课程投诉审核
|
|
|
*/
|
|
|
void courseScheduleCommplaintAudit(Long id, Double teacherLiabilityRatio, Double studentLiabilityRatio, AuditStatusEnum status);
|
|
|
-
|
|
|
- /**
|
|
|
- * 更新课程至结束状态
|
|
|
- * @return
|
|
|
- */
|
|
|
- boolean updateCourseScheduleToOverStatus();
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 更新课程至结束状态
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ boolean updateCourseScheduleToOverStatus();
|
|
|
|
|
|
/**
|
|
|
* 推送未签到消息提醒
|
|
@@ -222,7 +221,7 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
|
|
|
* @param courseScheduleId: 课程编号
|
|
|
* @return com.ym.mec.biz.dal.dto.CourseAttendanceDetailHeadInfoDto
|
|
|
*/
|
|
|
- CourseAttendanceDetailHeadInfoDto findCourseAttendanceDetailHeadInfo(Long courseScheduleId);
|
|
|
+ CourseAttendanceDetailHeadInfoDto findCourseAttendanceDetailHeadInfo(Long courseScheduleId);
|
|
|
|
|
|
/**
|
|
|
* @describe 检测指定乐团下所有班级是否已排课
|
|
@@ -240,24 +239,34 @@ public interface CourseScheduleService extends BaseService<Long, CourseSchedule>
|
|
|
* @param courseSchedules:
|
|
|
* @return java.util.Map<java.lang.Integer,java.lang.Integer>
|
|
|
*/
|
|
|
- Map<Integer,Integer> findCourseScheduleCurrentTimes(List<Integer> courseSchedules);
|
|
|
-
|
|
|
- /**
|
|
|
- * 查询班级未开始的课程
|
|
|
- *
|
|
|
- * @param classGroupId
|
|
|
- * @return
|
|
|
- */
|
|
|
- List<CourseSchedule> findNoStartCoursesByClassGroupId(Integer classGroupId);
|
|
|
-
|
|
|
- /**
|
|
|
- * 有课提醒
|
|
|
- * @return
|
|
|
- */
|
|
|
- void studentCoursesScheduleRemind();
|
|
|
-
|
|
|
- /**
|
|
|
- * 上课提醒
|
|
|
- */
|
|
|
- void studentSignInRemind();
|
|
|
+ Map<Integer, Integer> findCourseScheduleCurrentTimes(List<Integer> courseSchedules);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 查询班级未开始的课程
|
|
|
+ *
|
|
|
+ * @param classGroupId
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ List<CourseSchedule> findNoStartCoursesByClassGroupId(Integer classGroupId);
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 学生有课提醒
|
|
|
+ * @return
|
|
|
+ */
|
|
|
+ void studentCoursesScheduleRemind();
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 学生上课提醒
|
|
|
+ */
|
|
|
+ void studentSignInRemind();
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 老师课程提醒
|
|
|
+ */
|
|
|
+ void teacherCoursesScheduleRemind();
|
|
|
+
|
|
|
+ /**
|
|
|
+ * 老师上课提醒
|
|
|
+ */
|
|
|
+ void teacherSignInRemind();
|
|
|
}
|