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/repository/UserMapper.java |   27 +++++++++++++++++++++------
 1 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/mindskip/xzs/repository/UserMapper.java b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
index 6ba4984..036dbbb 100644
--- a/src/main/java/com/mindskip/xzs/repository/UserMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -6,9 +6,9 @@
 import com.mindskip.xzs.domain.User;
 import com.mindskip.xzs.domain.other.KeyValue;
 import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
-import com.mindskip.xzs.domain.vo.UserVO;
 import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
 import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,6 +33,7 @@
      * @return User
      */
     User getUserById(Integer id);
+    User getUserInfoById(Integer id);
 
     /**
      * getUserByUserName
@@ -81,7 +82,7 @@
      * @param requestVM requestVM
      * @return List<User>
      */
-    List<User> userPage(UserPageRequestVM requestVM);
+    List<UserResponseVM> userPage(UserPageRequestVM requestVM);
 
 
     /**
@@ -151,7 +152,7 @@
 
     List<ExamPaperAnswer> getUserByDept(@Param("query") ExamPaperGradeQuery query);
 
-    void setStatus(UserVO user);
+    void setStatus(User user);
 
     /**
      * 娓呴櫎鏌愰儴闂ㄧ殑鐢ㄦ埛绠$悊鍛樻爣璇�
@@ -165,11 +166,25 @@
 
     void updateUserDeptAdmin(UpdateDeptAdminVO form);
 
-    void cancelUserDeptAdmin(UpdateDeptAdminVO form);
+    void cancelUserDeptAdmin(List<Integer> userIds);
 
-    List<Integer> getDeptAdminIds(Integer id);
+    List<Integer> getDeptAdminIds(@Param("userId") Integer userId);
 
-    List<Department> getDeptAdmins(Integer id);
+    List<Department> getDeptAdmins(List<Integer> ids);
 
     User getUserByExamByTemplateId(ExamPaper examPaper);
+
+    List<Integer> getDeptIds(@Param("userId") Integer userId);
+
+    List<User> getFailExamUser(Integer examPaperId);
+
+    List<User> getFailTemplateUser(Integer templateId);
+
+    /**
+     * 鑾峰彇鐢ㄦ埛绠$悊鐨勯儴闂ㄤ俊鎭�
+     *
+     * @param userId
+     * @return
+     */
+    List<Department> getDeptAdminIdAndInfo(@Param("userId") Integer userId);
 }

--
Gitblit v1.8.0