From fc36338476ccb0e8fa641794de4022f300f59a2e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 16 七月 2024 13:59:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/mindskip/xzs/service/UserService.java | 32 ++++++++++++++++++++++++++++----
1 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/service/UserService.java b/src/main/java/com/mindskip/xzs/service/UserService.java
index 833fb39..a604df6 100644
--- a/src/main/java/com/mindskip/xzs/service/UserService.java
+++ b/src/main/java/com/mindskip/xzs/service/UserService.java
@@ -5,8 +5,8 @@
import com.mindskip.xzs.domain.ExamPaper;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.other.KeyValue;
-import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.viewmodel.admin.user.UserPageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.user.UserResponseVM;
import java.util.List;
@@ -77,7 +77,7 @@
* @param requestVM requestVM
* @return PageInfo<User>
*/
- PageInfo<User> userPage(UserPageRequestVM requestVM);
+ PageInfo<UserResponseVM> userPage(UserPageRequestVM requestVM);
/**
@@ -135,13 +135,37 @@
User getUserByRealName(String realName);
- void setStatus(UserVO user);
+ void setStatus(User user);
User getUserByExam(ExamPaper examPaper);
- List<Integer> getDeptAdminIds(Integer id);
+ List<Integer> getDeptAdminIds(Integer userId);
+
+ List<Department> getDeptAdminIdAndInfo(Integer userId);
List<Department> getDeptAdmins(Integer id);
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