From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug:学员有状态不能修改问题

---
 src/main/java/com/mindskip/xzs/service/UserService.java |   32 +++++++++++++++++++++++++++++---
 1 files changed, 29 insertions(+), 3 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..a1e69f6 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;
 
@@ -26,6 +27,7 @@
      * @return User
      */
     User getUserById(Integer id);
+    User getUserInfoById(Integer id);
 
     /**
      * getUserByUserName
@@ -76,7 +78,7 @@
      * @param requestVM requestVM
      * @return PageInfo<User>
      */
-    PageInfo<User> userPage(UserPageRequestVM requestVM);
+    PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM);
 
 
     /**
@@ -138,9 +140,33 @@
 
     User getUserByExam(ExamPaper examPaper);
 
-    List<Integer> getDeptAdminIds(Integer id);
+    List<Integer> getDeptAdminIds(Integer userId);
 
-    List<Department> getDeptAdmins(Integer id);
+    List<Department> getDeptAdminIdAndInfo(Integer userId);
+
+    List<Department> getDeptAdmins(List<Integer> ids);
 
     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