From 53dea0ef5fc8b035397b73b10f7a819ebf381b1c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 09 七月 2024 09:39:11 +0800
Subject: [PATCH] 分页优化
---
src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 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 9f1e521..467759d 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/DepartmentController.java
@@ -8,6 +8,7 @@
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.repository.DepartmentMapper;
@@ -30,13 +31,10 @@
@RequiredArgsConstructor
public class DepartmentController extends BaseApiController {
-
private final DepartmentService departmentService;
private final UserService userService;
private final UserDepartmentMapper userDepartmentMapper;
private final DepartmentMapper departmentMapper;
-
-
/**
* 鑾峰彇閮ㄩ棬涓嬬敤鎴峰垪琛�(涓嬫媺)
@@ -64,14 +62,14 @@
@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)
@@ -118,9 +116,43 @@
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));
}
+ @GetMapping("/cascader")
+ public RestResponse<List<CascaderDataVO>> cascader(){
+ return RestResponse.ok(departmentService.cascader());
+ }
+
}
--
Gitblit v1.8.0