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 | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/UserMapper.java b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
index a025abe..036dbbb 100644
--- a/src/main/java/com/mindskip/xzs/repository/UserMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -1,14 +1,16 @@
package com.mindskip.xzs.repository;
+import com.mindskip.xzs.domain.Department;
+import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.ExamPaperAnswer;
-import com.mindskip.xzs.domain.other.KeyValue;
import com.mindskip.xzs.domain.User;
-import com.mindskip.xzs.domain.vo.UserVO;
+import com.mindskip.xzs.domain.other.KeyValue;
+import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
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;
-import org.springframework.security.core.parameters.P;
import java.util.List;
import java.util.Map;
@@ -31,6 +33,7 @@
* @return User
*/
User getUserById(Integer id);
+ User getUserInfoById(Integer id);
/**
* getUserByUserName
@@ -79,7 +82,7 @@
* @param requestVM requestVM
* @return List<User>
*/
- List<User> userPage(UserPageRequestVM requestVM);
+ List<UserResponseVM> userPage(UserPageRequestVM requestVM);
/**
@@ -141,13 +144,47 @@
/**
* 淇敼閮ㄩ棬绠＄悊鍛樻爣璇�
- * @param id
+ * @param ids
* @param deptAdmin
*/
- void updateDeptAdmin(Integer id, String deptAdmin);
+ void updateDeptAdmin(@Param("ids") List<Integer> ids, @Param("deptAdmin") String deptAdmin, @Param("deptId") Integer deptId);
List<ExamPaperAnswer> getUserByDept(@Param("query") ExamPaperGradeQuery query);
- void setStatus(UserVO user);
+ void setStatus(User user);
+
+ /**
+ * 娓呴櫎鏌愰儴闂ㄧ殑鐢ㄦ埛绠＄悊鍛樻爣璇�
+ *
+ * @param userIds
+ * @param deptId
+ */
+ void clearDeptAdmin(List<Integer> userIds, @Param("deptId") Integer deptId);
+
+ User getUserByExam(ExamPaper examPaper);
+
+ void updateUserDeptAdmin(UpdateDeptAdminVO form);
+
+ void cancelUserDeptAdmin(List<Integer> userIds);
+
+ List<Integer> getDeptAdminIds(@Param("userId") Integer userId);
+
+ 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