From ccca8c65b3c76a9021a471a3667d61d965a4f2cb Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 11 五月 2024 18:04:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/repository/UserMapper.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..4ae498b 100644
--- a/src/main/java/com/mindskip/xzs/repository/UserMapper.java
+++ b/src/main/java/com/mindskip/xzs/repository/UserMapper.java
@@ -1,7 +1,11 @@
package com.mindskip.xzs.repository;
+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.viewmodel.admin.paper.ExamPaperGradeQuery;
import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -138,8 +142,23 @@
/**
* 淇敼閮ㄩ棬绠＄悊鍛樻爣璇�
- * @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);
+
+ /**
+ * 娓呴櫎鏌愰儴闂ㄧ殑鐢ㄦ埛绠＄悊鍛樻爣璇�
+ *
+ * @param userIds
+ * @param deptId
+ */
+ void clearDeptAdmin(List<Integer> userIds, @Param("deptId") Integer deptId);
+
+ User getUserByExam(ExamPaper examPaper);
}
--
Gitblit v1.8.0