From 8f05785d8885f7881c2636413b0b48288b52a372 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 09 五月 2024 18:04:28 +0800
Subject: [PATCH] feat：新增待补考学生记录（时段试卷过期自动保存、考试时间超时保存为待补考）
---
src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
index 843762e..627c892 100644
--- a/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
+++ b/src/main/java/com/mindskip/xzs/controller/admin/ExamTemplatesController.java
@@ -1,44 +1,64 @@
package com.mindskip.xzs.controller.admin;
+import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper;
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.ExamPaper;
import com.mindskip.xzs.domain.ExamTemplates;
import com.mindskip.xzs.domain.ExamTemplatesSubject;
import com.mindskip.xzs.domain.User;
import com.mindskip.xzs.domain.vo.ExamTemplatesVO;
+import com.mindskip.xzs.repository.DepartmentMapper;
import com.mindskip.xzs.repository.ExamTemplatesSubjectMapper;
+import com.mindskip.xzs.repository.UserDepartmentMapper;
import com.mindskip.xzs.service.ExamTemplatesService;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
+import java.util.Objects;
@RestController("AdminExamTemplatesController")
@RequestMapping(value = "/api/admin/exam/templates")
+@RequiredArgsConstructor
public class ExamTemplatesController extends BaseApiController {
private final ExamTemplatesService examTemplatesService;
private final ExamTemplatesSubjectMapper examTemplatesSubjectMapper;
-
- public ExamTemplatesController(ExamTemplatesService examTemplatesService, ExamTemplatesSubjectMapper examTemplatesSubjectMapper) {
- this.examTemplatesService = examTemplatesService;
- this.examTemplatesSubjectMapper = examTemplatesSubjectMapper;
- }
+ private final WebContext webContext;
+ private final DepartmentMapper departmentMapper;
@RequestMapping(value = "/edit", method = RequestMethod.POST)
public RestResponse edit(@RequestBody @Valid ExamPaperEditRequestVM model) {
+ User currentUser = webContext.getCurrentUser();
+ if (Objects.nonNull(currentUser)) {
+ // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+ if ("1".equals(currentUser.getDeptAdmin())) {
+ Integer deptId = departmentMapper.selectByAdminId(currentUser.getId());
+ model.setDeptId(deptId);
+ }
+ }
examTemplatesService.add(model);
return RestResponse.ok();
}
@RequestMapping(value = "/list", method = RequestMethod.GET)
public RestResponse<PageInfo<ExamTemplatesVO>> list(ExamTemplatesVO examTemplatesVO) throws Exception {
- PageInfo<ExamTemplates> pageInfo = examTemplatesService.gets(examTemplatesVO);
+ User currentUser = webContext.getCurrentUser();
+ if (Objects.nonNull(currentUser)) {
+ // 濡傛灉鏄儴闂ㄧ鐞嗗憳锛岄渶瑕佸仛鏁版嵁鏉冮檺
+ if ("1".equals(currentUser.getDeptAdmin())) {
+ Integer deptId = departmentMapper.selectByAdminId(currentUser.getId());
+ examTemplatesVO.setDeptId(deptId);
+ }
+ }
+ PageInfo<ExamTemplates> pageInfo = examTemplatesService.getByadmins(examTemplatesVO);
PageInfo<ExamTemplatesVO> info = PageInfoHelper.copyMap(pageInfo, e -> {
ExamTemplatesVO vo = new ExamTemplatesVO();
vo.setName(e.getName());
--
Gitblit v1.8.0