From 0879a157fd7c85ec34f1dac51a2b113bf1f5f2f6 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 07 六月 2024 15:53:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java |   20 ++++++++++++++++----
 src/main/resources/mapper/ExamPaperAnswerMapper.xml                        |    2 +-
 2 files changed, 17 insertions(+), 5 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 043c20b..c2b7566 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamPaperAnswerController.java
@@ -3,11 +3,14 @@
 import com.github.pagehelper.PageInfo;
 import com.ycl.jxkg.base.BaseApiController;
 import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.entity.ExamPaperAnswer;
+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.ExamPaperAnswerPageResponseVO;
 import com.ycl.jxkg.service.ExamPaperAnswerService;
-import com.ycl.jxkg.service.SubjectService;
-import com.ycl.jxkg.service.UserService;
+import com.ycl.jxkg.service.ExamPaperService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -17,8 +20,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) {
@@ -30,5 +32,15 @@
         return Result.ok(examPaperAnswerService.adminPage(model));
     }
 
+    @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);
+    }
 
 }
diff --git a/src/main/resources/mapper/ExamPaperAnswerMapper.xml b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
index 4185580..7a18975 100644
--- a/src/main/resources/mapper/ExamPaperAnswerMapper.xml
+++ b/src/main/resources/mapper/ExamPaperAnswerMapper.xml
@@ -67,7 +67,7 @@
 
     <select id="adminPage" resultType="com.ycl.jxkg.domain.vo.student.exampaper.ExamPaperAnswerPageResponseVO">
         SELECT
-        a.id , exam_paper_id, paper_name, paper_type, system_score, user_score DIV 10 AS user_score, paper_score DIV 10 AS paper_score,
+        a.id , exam_paper_id, paper_name, paper_type, system_score, user_score DIV 10 AS userScore, paper_score DIV 10 AS paperScore,
         question_correct, question_count, do_time, a.status, create_user, a.create_time, b.real_name AS userName
         FROM t_exam_paper_answer a
         LEFT JOIN t_user b ON a.create_user = b.id

--
Gitblit v1.8.0