From 1b5162ebb83ffc13e5c196ccd135ae5f98701edd Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 12 七月 2024 18:09:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/repository/UserMapper.java | 46 +++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 41 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/repository/UserMapper.java b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
index 89aaf6f..4354f1e 100644
--- a/src/main/java/com/mindskip/xzs/repository/UserMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -1,11 +1,16 @@
package com.mindskip.xzs.repository;
-import com.mindskip.xzs.domain.other.KeyValue;
+import com.mindskip.xzs.domain.Department;
+import com.mindskip.xzs.domain.ExamPaper;
+import com.mindskip.xzs.domain.ExamPaperAnswer;
import com.mindskip.xzs.domain.User;
+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;
@@ -76,7 +81,7 @@
* @param requestVM requestVM
* @return List<User>
*/
- List<User> userPage(UserPageRequestVM requestVM);
+ List<UserResponseVM> userPage(UserPageRequestVM requestVM);
/**
@@ -138,8 +143,39 @@
/**
* 淇敼閮ㄩ棬绠＄悊鍛樻爣璇�
- * @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(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(UpdateDeptAdminVO form);
+
+ List<Integer> getDeptAdminIds(Integer id);
+
+ List<Department> getDeptAdmins(Integer id);
+
+ User getUserByExamByTemplateId(ExamPaper examPaper);
+
+ List<Integer> getDeptIds(@Param("userId") Integer userId);
+
+ List<User> getFailExamUser(Integer examPaperId);
+
+ List<User> getFailTemplateUser(Integer templateId);
}
--
Gitblit v1.8.0