From 5f37dc3fac7e65e19ea02303243c4fd107f5f5cb Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 14 六月 2024 19:41:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
cloud-server-course/src/main/java/com/dsh/course/mapper/CoursePackageStudentMapper.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 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 af725af..fc5d66d 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
@@ -24,22 +24,24 @@
/**
* 获取排课预约信息
+ *
* @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);
+ StudentClassInfo listAll(@Param("tStudentId") Integer tStudentId);
- List<ClassListDto> getClassList(@Param("tStudentId")Integer tStudentId);
+ List<ClassListDto> getClassList(@Param("tStudentId") Integer tStudentId);
- Date getMaxDate(@Param("tStudentId")Integer tStudentId);
+ Date getMaxDate(@Param("tStudentId") Integer tStudentId);
void updateSignInOrNotById(@Param("id") Long id);
+ List<ClassListDto> getHoliList(@Param("tStudentId")Integer tStudentId);
}
--
Gitblit v1.7.1