From 0057ef145ab05b6c34802deb4ff575f975b6283a Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 16 五月 2024 18:19:15 +0800
Subject: [PATCH] feat：部门管理员功能权限控制

---
 src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java |   64 ++++++++++---------------------
 1 files changed, 21 insertions(+), 43 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..c32ed50 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java
@@ -4,51 +4,42 @@
 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.viewmodel.admin.paper.ExamPaperGradePageRequestVM;
-import org.springframework.beans.factory.annotation.Autowired;
+import com.mindskip.xzs.viewmodel.admin.paper.ExamPaperGradeQuery;
+import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @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 +97,19 @@
 //    }
 
     @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;
-            }
-            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);
+    public RestResponse<PageInfo<ExamPaperAnswer>> pageJudgeList(@RequestBody ExamPaperGradeQuery query) {
+        // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+        query.setDeptId(isDeptAdmin() ? getAdminDeptIds() : null);
+        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