From abdd896a66eced1355a24ea5eabbee497a745fe5 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 17 五月 2024 20:30:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/ExamPaperService.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/ExamPaperService.java b/src/main/java/com/mindskip/xzs/service/ExamPaperService.java
index 94896b7..38f9bdb 100644
--- a/src/main/java/com/mindskip/xzs/service/ExamPaperService.java
+++ b/src/main/java/com/mindskip/xzs/service/ExamPaperService.java
@@ -4,6 +4,7 @@
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.vo.PaperExcelVO;
+import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVO;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperPageRequestVM;
@@ -27,7 +28,7 @@
List<PaperInfo> indexPaper(PaperFilter paperFilter);
- Integer selectAllCount();
+ Integer selectAllCount(List<Integer> deptIds);
List<Integer> selectMothCount();
@@ -39,5 +40,14 @@
void missExam(ExamPaperEditRequestVM model);
- List<ExamPaper> list();
+ List<ExamPaper> list(List<Integer> deptIds);
+
+ /**
+ * 鑾峰彇閮ㄩ棬鐨勫鐢�
+ *
+ * @param userVO
+ * @param adminDeptIds
+ * @return
+ */
+ PageInfo<UserVO> selectStudent(UserVO userVO, List<Integer> adminDeptIds);
}
--
Gitblit v1.8.0