From d34df615e1f20c2a5bd3bcc0e1492bff9d649c42 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 六月 2024 14:25:14 +0800
Subject: [PATCH] 增加阅卷状态
---
src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java | 55 +++++++++++++++++++++++++++++--------------------------
1 files changed, 29 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
index 2cc7adc..28d7d0d 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
@@ -4,19 +4,21 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
-import com.ycl.jxkg.domain.entity.Subject;
-import com.ycl.jxkg.domain.entity.User;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperEditRequestVO;
import com.ycl.jxkg.domain.vo.admin.paper.ExamPaperAnswerPageRequestVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperReadVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitVO;
+import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerExportVO;
import com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO;
import com.ycl.jxkg.service.ExamPaperAnswerService;
-import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.service.UserService;
-import com.ycl.jxkg.utils.DateTimeUtil;
-import com.ycl.jxkg.utils.ExamUtil;
-import com.ycl.jxkg.utils.PageInfoHelper;
+import com.ycl.jxkg.service.ExamPaperService;
+import com.ycl.jxkg.utils.ExcelUtils;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.BeanUtils;
+import lombok.SneakyThrows;
import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
@RequiredArgsConstructor
@RestController("AdminExamPaperAnswerController")
@@ -24,8 +26,7 @@
public class ExamPaperAnswerController extends BaseApiController {
private final ExamPaperAnswerService examPaperAnswerService;
- private final SubjectService subjectService;
- private final UserService userService;
+ private final ExamPaperService examPaperService;
@PostMapping("/pageExamPaper")
public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageExamPaper(@RequestBody ExamPaperAnswerPageRequestVO model) {
@@ -34,23 +35,25 @@
@RequestMapping(value = "/page", method = RequestMethod.POST)
public Result<PageInfo<ExamPaperAnswerPageResponseVO>> pageJudgeList(@RequestBody ExamPaperAnswerPageRequestVO model) {
- PageInfo<ExamPaperAnswer> pageInfo = examPaperAnswerService.adminPage(model);
- PageInfo<ExamPaperAnswerPageResponseVO> page = PageInfoHelper.copyMap(pageInfo, e -> {
- ExamPaperAnswerPageResponseVO vo = new ExamPaperAnswerPageResponseVO();
- BeanUtils.copyProperties(e, vo);
- Subject subject = subjectService.getById(vo.getSubjectId());
- vo.setDoTime(ExamUtil.secondToVM(e.getDoTime()));
- vo.setSystemScore(ExamUtil.scoreToVM(e.getSystemScore()));
- vo.setUserScore(ExamUtil.scoreToVM(e.getUserScore()));
- vo.setPaperScore(ExamUtil.scoreToVM(e.getPaperScore()));
- vo.setSubjectName(subject.getName());
- vo.setCreateTime(DateTimeUtil.dateFormat(e.getCreateTime()));
- User user = userService.getById(e.getCreateUser());
- vo.setUserName(user.getUserName());
- return vo;
- });
- return Result.ok(page);
+ return Result.ok(examPaperAnswerService.adminPage(model));
}
+ @RequestMapping(value = "/exportExcel", method = RequestMethod.POST)
+ @SneakyThrows
+ public void exportExcel(ExamPaperAnswerPageRequestVO model, HttpServletResponse response) {
+ List<ExamPaperAnswerPageResponseVO> list = examPaperAnswerService.list(model);
+ ExcelUtils.exportExcelToTarget(response, "", "鎴愮哗鍒楄〃", list, ExamPaperAnswerExportVO.class);
+ }
+
+ @PostMapping("/read/{id}")
+ public Result<ExamPaperReadVO> read(@PathVariable Integer id) {
+ ExamPaperAnswer examPaperAnswer = examPaperAnswerService.getById(id);
+ ExamPaperReadVO vm = new ExamPaperReadVO();
+ ExamPaperEditRequestVO paper = examPaperService.examPaperToVM(examPaperAnswer.getExamPaperId());
+ ExamPaperSubmitVO answer = examPaperAnswerService.examPaperAnswerToVM(examPaperAnswer.getId());
+ vm.setPaper(paper);
+ vm.setAnswer(answer);
+ return Result.ok(vm);
+ }
}
--
Gitblit v1.8.0