From 83953fac1e778b6de84efaa09bc6913fed2e0b12 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 29 十月 2024 16:48:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ycl/jxkg/mapper/MeetMapper.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java b/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
index 74ae5f6..8f1e15c 100644
--- a/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
+++ b/src/main/java/com/ycl/jxkg/mapper/MeetMapper.java
@@ -1,14 +1,15 @@
package com.ycl.jxkg.mapper;
-import com.ycl.jxkg.domain.entity.Meet;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.ycl.jxkg.domain.entity.Meet;
import com.ycl.jxkg.domain.query.MeetQuery;
import com.ycl.jxkg.domain.vo.MeetVO;
-import com.ycl.jxkg.domain.form.MeetForm;
-import java.util.List;
+import com.ycl.jxkg.domain.vo.StudentSimpleVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* 浼氳琛� Mapper 鎺ュ彛
@@ -24,11 +25,19 @@
* @param id
* @return
*/
- MeetVO getById(Integer id);
+ Meet getById(Integer id);
/**
* 鍒嗛〉
*/
IPage getPage(IPage page, @Param("query") MeetQuery query);
+ /**
+ * 鑾峰彇浼氳瀵瑰簲鐝骇鐨勫鐢熷垪琛�
+ *
+ * @param meetId 浼氳ID
+ * @param keyword 鎼滅储
+ * @return
+ */
+ List<StudentSimpleVO> getStudentList(@Param("meetId") Integer meetId, @Param("keyword") String keyword);
}
--
Gitblit v1.8.0