From 03a9cd21c1589e98978dc7296bb7fb48f1dcd7fe Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期五, 17 五月 2024 16:13:45 +0800 Subject: [PATCH] feat:创建试卷时新增选择用户查询条件 --- src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 44 ++++++++++++++++++++++++++++++-------------- 1 files changed, 30 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 ded0bc5..9f1e521 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java @@ -4,18 +4,19 @@ import com.mindskip.xzs.base.BaseApiController; import com.mindskip.xzs.base.RestResponse; import com.mindskip.xzs.domain.Department; +import com.mindskip.xzs.domain.ExamPaper; import com.mindskip.xzs.domain.User; import com.mindskip.xzs.domain.UserDepartment; 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 org.springframework.beans.factory.annotation.Autowired; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.ObjectUtils; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; @@ -26,12 +27,16 @@ @RestController("AdminDepartmentController") @RequestMapping("/api/admin/department") +@RequiredArgsConstructor public class DepartmentController extends BaseApiController { private final DepartmentService departmentService; private final UserService userService; private final UserDepartmentMapper userDepartmentMapper; + private final DepartmentMapper departmentMapper; + + /** * 鑾峰彇閮ㄩ棬涓嬬敤鎴峰垪琛�(涓嬫媺) @@ -51,16 +56,9 @@ return RestResponse.ok(); } - @Autowired - public DepartmentController(DepartmentService departmentService, UserService userService, UserDepartmentMapper userDepartmentMapper) { - this.departmentService = departmentService; - this.userService = userService; - this.userDepartmentMapper = userDepartmentMapper; - } - @RequestMapping(value = "/list", method = RequestMethod.POST) public RestResponse<List<Department>> getAll(){ - List<Department> res = departmentService.gets(); + List<Department> res = departmentService.gets(new ArrayList<>()); return RestResponse.ok(res); } @@ -92,14 +90,26 @@ } @RequestMapping(value = "/getDepartmentUser", method = RequestMethod.POST) - public RestResponse<List<DepartmentVO>> getUserDepartment(){ - List<DepartmentVO> res = departmentService.gets() + public RestResponse<List<DepartmentVO>> getUserDepartment(Integer examPaperId){ + 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) { - list.add(userService.getUserById(userDepartment.getUserId())); + User user; + // 閫夋嫨琛ヨ�冪敤鎴锋椂鏌ヨ绗﹀悎琛ヨ�冩潯浠剁殑鐢ㄦ埛 + if (examPaperId != null) { + ExamPaper examPaper = new ExamPaper(); + examPaper.setCreateUser(userDepartment.getUserId()); + examPaper.setId(examPaperId); + user = userService.getUserByExam(examPaper); + } else { + user = userService.getUserById(userDepartment.getUserId()); + } + if (ObjectUtils.isNotEmpty(user)) { + list.add(user); + } } departmentVO.setUserList(list); departmentVO.setDepartment(e); @@ -107,4 +117,10 @@ }).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