From 9f9239bcfb791048bd68c4aeda83b0afd6c22c78 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 19 六月 2024 13:28:17 +0800
Subject: [PATCH] 学员答卷详情(阅卷)

---
 src/main/java/com/ycl/jxkg/service/ExamService.java             |   11 ++++++++++-
 src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitVO.java          |    4 ++++
 src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java    |   21 ++++++++++++++++++++-
 src/main/java/com/ycl/jxkg/controller/admin/ExamController.java |   11 +++++++++--
 4 files changed, 43 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
index 02aacdb..f9d5deb 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
@@ -83,8 +83,15 @@
 
     @GetMapping("/mark/paper/{id}")
     @PreAuthorize("hasAuthority('exam:markPaper')")
+    @ApiOperation(value = "鑾峰彇鑰冭瘯缁撴灉淇℃伅", notes = "鑾峰彇鑰冭瘯缁撴灉淇℃伅")
+    public Result getMarkResultInfo(@PathVariable("id") Integer id) {
+        return examService.getMarkResultInfo(id);
+    }
+
+    @GetMapping("/mark/paper/{examId}/{userId}")
+    @PreAuthorize("hasAuthority('exam:markPaper')")
     @ApiOperation(value = "鑾峰彇闃呭嵎淇℃伅", notes = "鑾峰彇闃呭嵎淇℃伅")
-    public Result getMarkPaperInfo(@PathVariable("id") Integer id) {
-        return examService.getMarkPaperInfo(id);
+    public Result getMarkPaperInfo(@PathVariable("examId") Integer examId, @PathVariable("userId") Integer userId) {
+        return examService.getMarkPaperInfo(examId, userId);
     }
 }
diff --git a/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitVO.java b/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitVO.java
index 6a2d76f..27830ec 100644
--- a/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitVO.java
+++ b/src/main/java/com/ycl/jxkg/domain/vo/ExamSubmitVO.java
@@ -2,6 +2,7 @@
 
 import lombok.Data;
 
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -18,6 +19,9 @@
     /** 鍋氶娑堣�楁椂闂� */
     private Integer doTime;
 
+    /** 淇敼鏃堕棿 */
+    private Date updateTime;
+
     /** 棰樼洰 */
     private List<PaperFixQuestionVO> paperQuestionList;
 }
diff --git a/src/main/java/com/ycl/jxkg/service/ExamService.java b/src/main/java/com/ycl/jxkg/service/ExamService.java
index e858dbb..47492f4 100644
--- a/src/main/java/com/ycl/jxkg/service/ExamService.java
+++ b/src/main/java/com/ycl/jxkg/service/ExamService.java
@@ -87,7 +87,7 @@
      * @param id
      * @return
      */
-    Result getMarkPaperInfo(Integer id);
+    Result getMarkResultInfo(Integer id);
 
     /**
      * 瀛︾敓绔垎椤�
@@ -104,4 +104,13 @@
      * @return
      */
     Result start(Integer id);
+
+    /**
+     * 鑾峰彇鏌愪釜浜虹殑绛斿嵎
+     *
+     * @param examId
+     * @param userId
+     * @return
+     */
+    Result getMarkPaperInfo(Integer examId, Integer userId);
 }
diff --git a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
index e2473ff..a9c9d76 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -301,7 +301,7 @@
     }
 
     @Override
-    public Result getMarkPaperInfo(Integer id) {
+    public Result getMarkResultInfo(Integer id) {
         Exam exam = baseMapper.selectById(id);
         if (Objects.isNull(exam)) {
             throw new RuntimeException("璇ヨ�冭瘯涓嶅瓨鍦�");
@@ -341,4 +341,23 @@
         return Result.ok().data(markPaperVO);
     }
 
+
+    @Override
+    public Result getMarkPaperInfo(Integer examId, Integer userId) {
+        ExamSubmitTemp userExam = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
+                .eq(ExamSubmitTemp::getExamId, examId)
+                .eq(ExamSubmitTemp::getUserId, userId)
+                .one();
+        if (Objects.isNull(userExam)) {
+            throw new RuntimeException("璇ュ鍛樿�冭瘯璁板綍涓嶅瓨鍦�");
+        }
+        ExamSubmitVO vo = new ExamSubmitVO();
+        vo.setExamId(userExam.getExamId());
+        vo.setDoTime(userExam.getDoTime());
+        vo.setUpdateTime(userExam.getUpdateTime());
+        if (StringUtils.hasText(userExam.getExamSubmit())) {
+            vo.setPaperQuestionList(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
+        }
+        return Result.ok(vo);
+    }
 }

--
Gitblit v1.8.0