From 3ec909b27b3eba956aa9d00cc7a94c179bd04bbf Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期三, 03 七月 2024 18:29:31 +0800 Subject: [PATCH] feat:新增随机时间题目配置 --- src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java | 22 +++++----------------- 1 files changed, 5 insertions(+), 17 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 e82e2ed..11a3f5b 100644 --- a/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java +++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamPaperGradeController.java @@ -1,6 +1,5 @@ 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; @@ -9,25 +8,20 @@ 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.apache.commons.lang3.ObjectUtils; 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; -import java.util.Objects; @RestController("AdminExamPaperGradeController") @RequestMapping(value = "/api/admin/examPaperGrade") @@ -105,14 +99,8 @@ @RequestMapping(value = "/page", method = RequestMethod.POST) 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())); - } - } + // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺 + query.setDeptId(ObjectUtils.isNotEmpty(query.getDeptId()) ? query.getDeptId() : getAdminDeptIds()); query.setFullTime(); // 鏌ヨ PageInfo<ExamPaperAnswer> info = PageHelper.startPage(query.getPageIndex(), query.getPageSize()).doSelectPageInfo(() -> @@ -121,8 +109,8 @@ } @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