From d643b843cc794d8f59c4ecd04bda2b9d35e5b22a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 28 十一月 2023 19:54:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java | 18 ++++++++++++++++--
1 files changed, 16 insertions(+), 2 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 3a6eba8..c7b7e9b 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
@@ -3,8 +3,11 @@
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;
@@ -21,12 +24,23 @@
/**
* 获取排课预约信息
+ *
* @param page
- * @param coursePackageSchedulingId
+ * @param ids
* @param userId
* @param studentId
* @return
*/
- List<Map<String, Object>> queryCoursePackageStudentList(Page<Map<String, Object>> page, @Param("coursePackageSchedulingId") Long coursePackageSchedulingId,
+ List<Map<String, Object>> queryCoursePackageStudentList(Page<Map<String, Object>> page, @Param("ids") List<Long> ids,
@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);
+
+ void updateSignInOrNotById(@Param("id") Long id);
+
+
}
--
Gitblit v1.7.1