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/student/QuestionAnswerController.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java b/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
index 755d6c1..24b66b4 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/QuestionAnswerController.java
@@ -2,9 +2,9 @@
import com.ycl.jxkg.base.BaseApiController;
import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.ExamPaperQuestionCustomerAnswer;
-import com.ycl.jxkg.domain.Subject;
-import com.ycl.jxkg.domain.TextContent;
+import com.ycl.jxkg.domain.entity.ExamPaperQuestionCustomerAnswer;
+import com.ycl.jxkg.domain.entity.Subject;
+import com.ycl.jxkg.domain.entity.TextContent;
import com.ycl.jxkg.domain.question.QuestionObject;
import com.ycl.jxkg.service.ExamPaperQuestionCustomerAnswerService;
import com.ycl.jxkg.service.QuestionService;
@@ -14,16 +14,17 @@
import com.ycl.jxkg.utils.HtmlUtil;
import com.ycl.jxkg.utils.JsonUtil;
import com.ycl.jxkg.utils.PageInfoHelper;
-import com.ycl.jxkg.vo.admin.question.QuestionEditRequestVO;
-import com.ycl.jxkg.vo.student.exam.ExamPaperSubmitItemVO;
-import com.ycl.jxkg.vo.student.question.answer.QuestionAnswerVO;
-import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentRequestVO;
-import com.ycl.jxkg.vo.student.question.answer.QuestionPageStudentResponseVO;
+import com.ycl.jxkg.domain.vo.admin.question.QuestionEditRequestVO;
+import com.ycl.jxkg.domain.vo.student.exam.ExamPaperSubmitItemVO;
+import com.ycl.jxkg.domain.vo.student.question.answer.QuestionAnswerVO;
+import com.ycl.jxkg.domain.vo.student.question.answer.QuestionPageStudentRequestVO;
+import com.ycl.jxkg.domain.vo.student.question.answer.QuestionPageStudentResponseVO;
import com.github.pagehelper.PageInfo;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+@RequiredArgsConstructor
@RestController("StudentQuestionAnswerController")
@RequestMapping(value = "/api/student/question/answer")
public class QuestionAnswerController extends BaseApiController {
@@ -33,25 +34,16 @@
private final TextContentService textContentService;
private final SubjectService subjectService;
- @Autowired
- public QuestionAnswerController(ExamPaperQuestionCustomerAnswerService examPaperQuestionCustomerAnswerService, QuestionService questionService, TextContentService textContentService, SubjectService subjectService) {
- this.examPaperQuestionCustomerAnswerService = examPaperQuestionCustomerAnswerService;
- this.questionService = questionService;
- this.textContentService = textContentService;
- this.subjectService = subjectService;
- }
-
@RequestMapping(value = "/page", method = RequestMethod.POST)
public Result<PageInfo<QuestionPageStudentResponseVO>> pageList(@RequestBody QuestionPageStudentRequestVO model) {
model.setCreateUser(getCurrentUser().getId());
PageInfo<ExamPaperQuestionCustomerAnswer> pageInfo = examPaperQuestionCustomerAnswerService.studentPage(model);
PageInfo<QuestionPageStudentResponseVO> page = PageInfoHelper.copyMap(pageInfo, q -> {
- Subject subject = subjectService.selectById(q.getSubjectId());
+ Subject subject = subjectService.getById(q.getSubjectId());
QuestionPageStudentResponseVO vo = new QuestionPageStudentResponseVO();
BeanUtils.copyProperties(q, vo);
vo.setCreateTime(DateTimeUtil.dateFormat(q.getCreateTime()));
- TextContent textContent = textContentService.selectById(q.getQuestionTextContentId());
- QuestionObject questionObject = JsonUtil.toJsonObject(textContent.getContent(), QuestionObject.class);
+ QuestionObject questionObject = JsonUtil.toJsonObject(q.getQuestionContent(), QuestionObject.class);
String clearHtml = HtmlUtil.clear(questionObject.getTitleContent());
vo.setShortTitle(clearHtml);
vo.setSubjectName(subject.getName());
@@ -64,7 +56,7 @@
@RequestMapping(value = "/select/{id}", method = RequestMethod.POST)
public Result<QuestionAnswerVO> select(@PathVariable Integer id) {
QuestionAnswerVO vm = new QuestionAnswerVO();
- ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer = examPaperQuestionCustomerAnswerService.selectById(id);
+ ExamPaperQuestionCustomerAnswer examPaperQuestionCustomerAnswer = examPaperQuestionCustomerAnswerService.getById(id);
ExamPaperSubmitItemVO questionAnswerVM = examPaperQuestionCustomerAnswerService.examPaperQuestionCustomerAnswerToVM(examPaperQuestionCustomerAnswer);
QuestionEditRequestVO questionVM = questionService.getQuestionEditRequestVM(examPaperQuestionCustomerAnswer.getQuestionId());
vm.setQuestionVM(questionVM);
--
Gitblit v1.8.0