From fb69f03a1fc6c2ed30c805020ea596017633adb8 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期五, 17 五月 2024 22:18:12 +0800
Subject: [PATCH] feat：随机试卷补考
---
src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java | 19 ++++++++++++-------
1 files changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java b/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java
index 0ca9dc8..7dd6d8f 100644
--- a/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java
+++ b/src/main/java/com/mindskip/xzs/controller/student/ExamPaperController.java
@@ -13,6 +13,7 @@
import com.mindskip.xzs.utility.DateTimeUtil;
import com.mindskip.xzs.utility.PageInfoHelper;
import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVM;
+import com.mindskip.xzs.viewmodel.admin.exam.ExamPaperEditRequestVO;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageResponseVM;
import com.mindskip.xzs.viewmodel.student.exam.ExamPaperPageVM;
import com.github.pagehelper.PageInfo;
@@ -46,9 +47,8 @@
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
- public RestResponse<ExamPaperEditRequestVM> select(@PathVariable Integer id) {
- ExamPaperEditRequestVM vm = examPaperService.examPaperToVM(id);
- return RestResponse.ok(vm);
+ public RestResponse<ExamPaperEditRequestVO> select(@PathVariable Integer id) {
+ return RestResponse.ok(examPaperService.examPaperToVM(id));
}
@@ -59,7 +59,14 @@
PageInfo<ExamPaperPageResponseVM> page = PageInfoHelper.copyMap(pageInfo, e -> {
Integer[] ids = examPaperDepartmentService.getByExamPaperId(e.getId())
.stream().map(ExamPaperDepartment::getDepartmentId).toArray(Integer[]::new);
+ Integer[] userExamPaperIds = examPaperUserService.getByExamPaperId(e.getId())
+ .stream().map(ExamPaperUser::getUserId).toArray(Integer[]::new);
if (Arrays.asList(ids).contains(user.getUserLevel())) {
+ ExamPaperPageResponseVM vm = modelMapper.map(e, ExamPaperPageResponseVM.class);
+ vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
+ return vm;
+ }
+ if (Arrays.asList(userExamPaperIds).contains(user.getId())) {
ExamPaperPageResponseVM vm = modelMapper.map(e, ExamPaperPageResponseVM.class);
vm.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
return vm;
@@ -78,7 +85,7 @@
}
@RequestMapping(value = "/edit", method = RequestMethod.POST)
- public RestResponse<ExamPaperEditRequestVM> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
+ public RestResponse<ExamPaperEditRequestVO> edit(@RequestBody @Valid ExamPaperEditRequestVM model) throws Exception {
ExamPaperUser examPaperUser = new ExamPaperUser();
User user = getCurrentUser();
model.setDepartmentIds(new Integer[0]);
@@ -90,8 +97,6 @@
examPaperUser.setDeleted("0");
examPaperUserService.add(examPaperUser);
-
- ExamPaperEditRequestVM newVM = examPaperService.examPaperToVM(examPaper.getId());
- return RestResponse.ok(newVM);
+ return RestResponse.ok(examPaperService.examPaperToVM(examPaper.getId()));
}
}
--
Gitblit v1.8.0