From 852681bc9257e9eaae64d027a9bc6d88f93f35b4 Mon Sep 17 00:00:00 2001 From: liujie <liujie> Date: 星期六, 23 九月 2023 09:51:56 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java | 24 +++++++++++++++++++++--- 1 files changed, 21 insertions(+), 3 deletions(-) diff --git a/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java b/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java index d686cf9..a8668aa 100644 --- a/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java +++ b/cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java @@ -1,10 +1,15 @@ package com.dsh.course.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.dsh.course.entity.CoursePackageStudent; +import com.dsh.course.entity.StudentClassInfo; +import com.dsh.course.entity.dto.ClassListDto; import org.apache.ibatis.annotations.Param; +import java.util.Date; import java.util.List; +import java.util.Map; /** * <p> @@ -16,8 +21,21 @@ */ public interface CoursePackageStudentMapper extends BaseMapper<CoursePackageStudent> { - List<CoursePackageStudent> queryStuDeduClassHourNums(@Param("courseId") Integer courseId, - @Param("stuId") Integer stuId, - @Param("appUserId") Integer appUserId); + /** + * 获取排课预约信息 + * @param page + * @param coursePackageSchedulingId + * @param userId + * @param studentId + * @return + */ + List<Map<String, Object>> queryCoursePackageStudentList(Page<Map<String, Object>> page, @Param("coursePackageSchedulingId") Long coursePackageSchedulingId, + @Param("userId") List<Integer> userId, @Param("studentId") List<Integer> studentId); + + StudentClassInfo listAll(@Param("tStudentId")Integer tStudentId); + + List<ClassListDto> getClassList(@Param("tStudentId")Integer tStudentId); + + Date getMaxDate(@Param("tStudentId")Integer tStudentId); } -- Gitblit v1.7.1