From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期三, 03 七月 2024 18:29:31 +0800
Subject: [PATCH] feat：新增随机时间题目配置
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 51 +++++++++++++++++++++++++++++++++++++--------------
1 files changed, 37 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
index 1d3da20..6e85feb 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -10,22 +10,18 @@
import com.mindskip.xzs.domain.vo.BaseSelect;
import com.mindskip.xzs.domain.vo.DepartmentVO;
import com.mindskip.xzs.domain.vo.UpdateDeptAdminVO;
-import com.mindskip.xzs.domain.vo.UserVO;
import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.UserDepartmentMapper;
import com.mindskip.xzs.service.DepartmentService;
import com.mindskip.xzs.service.UserService;
-import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.department.DepartmentResponseVM;
import lombok.RequiredArgsConstructor;
import org.apache.commons.lang3.ObjectUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.ArrayList;
import java.util.List;
-import java.util.Objects;
import java.util.stream.Collectors;
@@ -62,7 +58,7 @@
@RequestMapping(value = "/list", method = RequestMethod.POST)
public RestResponse<List<Department>> getAll(){
- List<Department> res = departmentService.gets(-1);
+ List<Department> res = departmentService.gets(new ArrayList<>());
return RestResponse.ok(res);
}
@@ -95,15 +91,7 @@
@RequestMapping(value = "/getDepartmentUser", method = RequestMethod.POST)
public RestResponse<List<DepartmentVO>> getUserDepartment(Integer examPaperId){
- User currentUser = webContext.getCurrentUser();
- Integer deptId = null;
- if (Objects.nonNull(currentUser)) {
- // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
- if ("1".equals(currentUser.getDeptAdmin())) {
- deptId = departmentMapper.selectByAdminId(currentUser.getId());
- }
- }
- List<DepartmentVO> res = departmentService.gets(deptId)
+ List<DepartmentVO> res = departmentService.gets(isDeptAdmin() ? getAdminDeptIds() : null)
.stream().map(e->{
DepartmentVO departmentVO = new DepartmentVO();
List<UserDepartment> userDepartments = userDepartmentMapper.selectByDepartmentId(e.getId());
@@ -129,4 +117,39 @@
}).collect(Collectors.toList());
return RestResponse.ok(res);
}
+
+ @RequestMapping(value = "/getDepartmentUserByTemplateId", method = RequestMethod.POST)
+ public RestResponse<List<DepartmentVO>> getDepartmentUserByTemplateId(Integer templateId){
+ List<DepartmentVO> res = departmentService.gets(isDeptAdmin() ? getAdminDeptIds() : null)
+ .stream().map(e->{
+ DepartmentVO departmentVO = new DepartmentVO();
+ List<UserDepartment> userDepartments = userDepartmentMapper.selectByDepartmentId(e.getId());
+ List<User> list = new ArrayList<>();
+ for (UserDepartment userDepartment : userDepartments) {
+ User user;
+ // 閫夋嫨琛ヨ�冪敤鎴锋椂鏌ヨ绗﹀悎琛ヨ�冩潯浠剁殑鐢ㄦ埛
+ if (templateId != null) {
+ ExamPaper examPaper = new ExamPaper();
+ examPaper.setCreateUser(userDepartment.getUserId());
+ examPaper.setId(templateId);
+ user = userService.getUserByExamByTemplateId(examPaper);
+ } else {
+ user = userService.getUserById(userDepartment.getUserId());
+ }
+ if (ObjectUtils.isNotEmpty(user)) {
+ list.add(user);
+ }
+ }
+ departmentVO.setUserList(list);
+ departmentVO.setDepartment(e);
+ return departmentVO;
+ }).collect(Collectors.toList());
+ return RestResponse.ok(res);
+ }
+
+ @RequestMapping(value = "/getDeptAdmins", method = RequestMethod.GET)
+ public RestResponse<List<Department>> getDeptAdmins(){
+ return RestResponse.ok(userService.getDeptAdmins(isDeptAdmin() ? getCurrentUser().getId() : null));
+ }
+
}
--
Gitblit v1.8.0