From ca65201b191d446e11054199932a7465a3b1955a Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 09 五月 2024 15:35:33 +0800
Subject: [PATCH] 部门管理员优化
---
src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java | 65 ++++++++++++++------------------
1 files changed, 28 insertions(+), 37 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java
index 0469737..5132110 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java
@@ -1,16 +1,24 @@
package com.mindskip.xzs.controller.admin;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.mindskip.xzs.base.BaseApiController;
import com.mindskip.xzs.base.RestResponse;
+import com.mindskip.xzs.context.WebContext;
import com.mindskip.xzs.domain.ExamPaperAnswer;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.UserDepartment;
import com.mindskip.xzs.domain.vo.ScoreTemplatesCountVO;
+import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.ExamPaperAnswerMapper;
+import com.mindskip.xzs.repository.UserDepartmentMapper;
+import com.mindskip.xzs.repository.UserMapper;
import com.mindskip.xzs.service.*;
+import com.mindskip.xzs.utility.minio.DateUtils;
import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
+import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,36 +27,26 @@
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
@RestController("AdminExamPaperGradeController")
@RequestMapping(value = "/api/admin/examPaperGrade")
+@RequiredArgsConstructor
public class ExamPaperGradeController extends BaseApiController {
private final ExamPaperAnswerService examPaperAnswerService;
-
private final SubjectService subjectService;
private final UserService userService;
+ private final UserMapper userMapper;
private final ExamPaperSubjectService examPaperSubjectService;
-
private final ScoreTemplatesUserCountService scoreTemplatesUserCountService;
-
private final ExamPaperUserService examPaperUserService;
-
private final UserDepartMentService userDepartMentService;
-
+ private final UserDepartmentMapper userDepartmentMapper;
private final ExamPaperAnswerMapper examPaperAnswerMapper;
+ private final WebContext webContext;
+ private final DepartmentMapper departmentMapper;
- @Autowired
- public ExamPaperGradeController(ExamPaperAnswerService examPaperAnswerService, SubjectService subjectService, UserService userService, ExamPaperSubjectService examPaperSubjectService, ScoreTemplatesUserCountService scoreTemplatesUserCountService, ExamPaperUserService examPaperUserService, UserDepartMentService userDepartMentService, ExamPaperAnswerMapper examPaperAnswerMapper) {
- this.examPaperAnswerService = examPaperAnswerService;
- this.subjectService = subjectService;
- this.userService = userService;
- this.examPaperSubjectService = examPaperSubjectService;
- this.scoreTemplatesUserCountService = scoreTemplatesUserCountService;
- this.examPaperUserService = examPaperUserService;
- this.userDepartMentService = userDepartMentService;
- this.examPaperAnswerMapper = examPaperAnswerMapper;
- }
// @RequestMapping(value = "/page", method = RequestMethod.POST)
@@ -106,32 +104,25 @@
// }
@RequestMapping(value = "/page", method = RequestMethod.POST)
- public RestResponse<PageInfo<ExamPaperAnswer>> pageJudgeList(@RequestBody ExamPaperGradePageRequestVM grade) {
- List<ExamPaperAnswer> filteredList9 = new ArrayList<>();
- PageInfo<User> info = PageHelper.startPage(grade.getPageIndex(), grade.getPageSize(), "id desc").doSelectPageInfo(() ->
- userService.getUsers());
- for (User user : info.getList()) {
- if("绠＄悊鍛�".equals(user.getRealName())){
- continue;
+ public RestResponse<PageInfo<ExamPaperAnswer>> pageJudgeList(@RequestBody ExamPaperGradeQuery query) {
+ // 鏌ュ嚭鐢ㄦ埛锛堝苟鍋氭暟鎹潈闄愶級
+ User currentUser = webContext.getCurrentUser();
+ if (Objects.nonNull(currentUser)) {
+ // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+ if ("1".equals(currentUser.getDeptAdmin())) {
+ query.setDeptId(departmentMapper.selectByAdminId(currentUser.getId()));
}
- ExamPaperAnswer answer = new ExamPaperAnswer();
- answer.setCreateUser(user.getId());
- answer.setUserName(user.getRealName());
- ScoreTemplatesCountVO vo = new ScoreTemplatesCountVO();
- vo.setCreateUser(user.getId());
- List<ExamPaperAnswer> byCreatUser = examPaperAnswerMapper.getByCreatUser(vo);
- answer.setCounts(byCreatUser.size());
- filteredList9.add(answer);
}
- PageHelper.startPage(grade.getPageIndex(), grade.getPageSize());
- PageInfo<ExamPaperAnswer> pageInfoPageInfo = new PageInfo<>(filteredList9);
- pageInfoPageInfo.setTotal(info.getTotal());
- return RestResponse.ok(pageInfoPageInfo);
+ query.setFullTime();
+ // 鏌ヨ
+ PageInfo<ExamPaperAnswer> info = PageHelper.startPage(query.getPageIndex(), query.getPageSize()).doSelectPageInfo(() ->
+ userMapper.getUserByDept(query));
+ return RestResponse.ok(info);
}
@RequestMapping(value = "/details", method = RequestMethod.POST)
- public RestResponse<PageInfo<ExamPaperAnswer>> selectSource(@RequestBody ScoreTemplatesCountVO scoreTemplatesCountVO) throws Exception {
- return RestResponse.ok(examPaperAnswerService.getByCreatUser(scoreTemplatesCountVO));
+ public RestResponse<PageInfo<ExamPaperAnswer>> selectSource(@RequestBody ExamPaperGradeQuery query) throws Exception {
+ return RestResponse.ok(examPaperAnswerService.getByCreatUser(query));
}
--
Gitblit v1.8.0