From 47cd9ecc0eff38ffe6b3b794b2bf197e958f4403 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 14 五月 2025 15:50:57 +0800
Subject: [PATCH] bug：学员有状态不能修改问题
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 94 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 21 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..b8eb2a4 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -1,21 +1,22 @@
package com.mindskip.xzs.controller.admin;
-import com.github.pagehelper.PageInfo;
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.CascaderDataVO;
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,13 @@
@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,29 +53,22 @@
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);
}
@RequestMapping(value = "/page/list", method = RequestMethod.POST)
- public RestResponse<PageInfo<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
- PageInfo<DepartmentResponseVM> pageInfo = departmentService.gets(model);
+ public RestResponse<List<DepartmentResponseVM>> pageList(@RequestBody DepartmentResponseVM model) {
+ List<DepartmentResponseVM> pageInfo = departmentService.gets(model);
return RestResponse.ok(pageInfo);
}
@RequestMapping(value = "/add", method = RequestMethod.POST)
- public RestResponse add(@RequestBody @Valid String name) {
- return RestResponse.ok(departmentService.add(name));
+ public RestResponse add(@RequestBody @Valid Department model) {
+ return RestResponse.ok(departmentService.add(model));
}
@RequestMapping(value = "/update", method = RequestMethod.POST)
@@ -83,7 +78,7 @@
@RequestMapping(value = "/get/{id}", method = RequestMethod.POST)
public RestResponse update(@PathVariable Integer id) {
- return RestResponse.ok(departmentService.getById(id));
+ return RestResponse.ok(departmentService.getByIdVO(id));
}
@RequestMapping(value = "/getUserByDepartment/{id}", method = RequestMethod.POST)
@@ -92,14 +87,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 +114,49 @@
}).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() ? getAdminDeptIds() : null));
+ }
+
+ @GetMapping("/cascader")
+ public RestResponse<List<CascaderDataVO>> cascader(){
+ return RestResponse.ok(departmentService.cascader());
+ }
+
+ @GetMapping("/getCurrentDeptId")
+ public RestResponse<List<Integer>> getCurrentDeptIds(){
+ return RestResponse.ok(getAdminDeptIds());
+ }
+
}
--
Gitblit v1.8.0