From 83024eccacc54be0e60eee14d19d03bf9d63ba78 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 11 七月 2024 11:41:54 +0800
Subject: [PATCH] 调整session、caffeine存活时间

---
 src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

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 0f0e2f8..b7b26f0 100644
--- a/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
+++ b/src/main/java/com/ycl/jxkg/service/impl/ExamServiceImpl.java
@@ -597,11 +597,11 @@
 
     @Override
     public Result getMarkPaperInfo(Integer examId, Integer userId) {
+        User student = userMapper.getUserById(userId);
         //濡傛灉宸茬粡闃呰繃鍗蜂簡锛屾煡鎴愮哗琛�
-        Result<ExamPaperMarkVO> paperMarkVO1 = checkHasJudge(examId, userId);
+        Result<ExamPaperMarkVO> paperMarkVO1 = checkHasJudge(examId, student);
         if (paperMarkVO1 != null) return paperMarkVO1;
 
-        User student = userMapper.getUserById(userId);
         ExamVO exam = examMapper.getById(examId);
         //瀛︾敓绛旈琛�
         ExamSubmitTemp userExam = new LambdaQueryChainWrapper<>(examSubmitTempMapper)
@@ -643,11 +643,12 @@
     }
 
     //妫�鏌ユ槸鍚﹂槄鍗�
-    private Result<ExamPaperMarkVO> checkHasJudge(Integer examId, Integer userId) {
-        ExamPaperScore examPaperScore = examPaperScoreMapper.getByExamIdUserId(examId, userId);
+    private Result<ExamPaperMarkVO> checkHasJudge(Integer examId, User student) {
+        ExamPaperScore examPaperScore = examPaperScoreMapper.getByExamIdUserId(examId, student.getId());
         if (examPaperScore != null) {
             ExamPaperMarkVO paperMarkVO = new ExamPaperMarkVO();
             BeanUtils.copyProperties(examPaperScore, paperMarkVO);
+            paperMarkVO.setUserName(student.getRealName());
             paperMarkVO.setTotalScore(examPaperScore.getTotalScore() + "");
             paperMarkVO.setScore(examPaperScore.getScore() + "");
             if (!StringUtils.isEmpty(examPaperScore.getPaperContent())) {
@@ -841,7 +842,7 @@
             paperMarkVO.setTitleItems(JSON.parseArray(userExam.getExamSubmit(), PaperFixQuestionVO.class));
         } else {
             //缂鸿�冿紝瀛︾敓娌℃湁鍋氶淇℃伅
-            paperMarkVO.setExamId(exam.getExamPaperId());
+            paperMarkVO.setExamId(exam.getId());
             paperMarkVO.setUserId(student.getId());
             paperMarkVO.setScore(BigDecimal.ZERO + "");
             paperMarkVO.setDoTime(0);

--
Gitblit v1.8.0