From 81dcd6b9c960875a4b0d083ac848c7649d95ce13 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 10 七月 2024 18:01:20 +0800
Subject: [PATCH] fix 用户列表增加部门条件 随机试卷列表增加部门,时间,科目条件 补考直接展示学生

---
 src/main/java/com/mindskip/xzs/service/UserService.java |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index c5dd26d..0b5753f 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -6,6 +6,7 @@
 import com.mindskip.xzs.domain.User;
 import com.mindskip.xzs.domain.other.KeyValue;
 import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
 
 import java.util.List;
 
@@ -76,7 +77,7 @@
      * @param requestVM requestVM
      * @return PageInfo<User>
      */
-    PageInfo<User> userPage(UserPageRequestVM requestVM);
+    PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM);
 
 
     /**
@@ -143,4 +144,26 @@
     List<Department> getDeptAdmins(Integer id);
 
     User getUserByExamByTemplateId(ExamPaper examPaper);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛鎵�鍦ㄩ儴闂�
+     *
+     * @param id
+     * @return
+     */
+    List<Integer> getDeptIds(Integer id);
+
+    /**
+     * 鑾峰彇闇�瑕佽ˉ鑰冪殑鐢ㄦ埛
+     * @param examPaperId 璇曞嵎id
+     * @return 鐢ㄦ埛涓嬫媺
+     */
+    List<User> getFailExamUser(Integer examPaperId);
+
+    /**
+     * 鑾峰彇闇�瑕佽ˉ鑰冪殑鐢ㄦ埛
+     * @param templateId 闅忔満璇曞嵎id
+     * @return 鐢ㄦ埛涓嬫媺
+     */
+    List<User> getFailTemplateUser(Integer templateId);
 }

--
Gitblit v1.8.0