From 1a2f5597041772d47cf2e3c839fd189cf7d3be6e Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 17 七月 2024 13:37:22 +0800
Subject: [PATCH] feat：部门管理员支持查看超管试卷发布的成绩
---
src/main/java/com/mindskip/xzs/controller/admin/UserController.java | 32 ++++++++++++++++++++++----------
1 files changed, 22 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
index 8478851..63a9b14 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/UserController.java
@@ -138,19 +138,21 @@
}
Map<Integer, UserDepartment> oldDeptUser = userDepartmentMapper.selectByUserId(user.getId()).stream().collect(Collectors.toMap(UserDepartment::getDepartmentId, userDept -> userDept));
userDepartmentMapper.removeByUserId(user.getId());
- for (Integer s : model.getDeptIds()) {
- UserDepartment userDepartment = new UserDepartment();
- userDepartment.setUserId(user.getId());
- userDepartment.setDepartmentId(s);
- if (Objects.nonNull(oldDeptUser.get(s))) {
- userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
- } else {
- userDepartment.setDeptAdmin("0");
+ if (ObjectUtils.isNotEmpty(model.getDeptIds())) {
+ for (Integer s : model.getDeptIds()) {
+ UserDepartment userDepartment = new UserDepartment();
+ userDepartment.setUserId(user.getId());
+ userDepartment.setDepartmentId(s);
+ if (Objects.nonNull(oldDeptUser.get(s))) {
+ userDepartment.setDeptAdmin(oldDeptUser.get(s).getDeptAdmin());
+ } else {
+ userDepartment.setDeptAdmin("0");
+ }
+ userDepartmentMapper.insert(userDepartment);
}
- userDepartmentMapper.insert(userDepartment);
}
+ tagService.removeUserTagByUserId(user.getId());
if (ObjectUtils.isNotEmpty(model.getTagIds())) {
- tagService.removeUserTagByUserId(user.getId());
tagService.saveBatchUserTag(model.getTagIds().stream().map(
tagId -> new UserTag() {{
setUserId(user.getId());
@@ -231,4 +233,14 @@
return RestResponse.ok();
}
+ @GetMapping("/getFailExamUser/{examPaperId}")
+ public RestResponse<List<User>> getFailExamUser(@PathVariable Integer examPaperId) {
+ return RestResponse.ok(userService.getFailExamUser(examPaperId));
+ }
+
+ @GetMapping("/getFailTemplateUser/{templateId}")
+ public RestResponse<List<User>> getFailTemplateUser(@PathVariable Integer templateId) {
+ return RestResponse.ok(userService.getFailTemplateUser(templateId));
+ }
+
}
--
Gitblit v1.8.0