From b3f8c030edc199ad6b11efe10de9421d134127d2 Mon Sep 17 00:00:00 2001
From: Mlxa0324 <mlx950324@163.com>
Date: Fri, 24 Mar 2023 21:47:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B2=A1=E6=8F=90=E4=BA=A4=E8=AF=95=E5=8D=B7?=
 =?UTF-8?q?=EF=BC=8C=E5=86=8D=E6=AC=A1=E8=BF=9B=E6=9D=A5=E5=9B=9E=E6=98=BE?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E7=AD=94=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GeneralQuestionSettingService.java        | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
index 18be3422..e13debd2 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/GeneralQuestionSettingService.java
@@ -42,12 +42,14 @@ import javax.validation.constraints.NotNull;
 import java.io.*;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 import static cn.hutool.core.util.ObjectUtil.defaultIfNull;
 import static cn.jlw.util.CacheUserUtil.getStudent;
 import static cn.jlw.util.QuestionUtil.shuffleQuestion;
 import static com.ibeetl.admin.core.util.ExcelUtil.getCellFormatValue;
 import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.FINALLY_SUBMIT;
+import static com.ibeetl.jlw.enums.QuestionLogAddTypeEnum.LOCK;
 import static com.ibeetl.jlw.enums.ResourcesQuestionSnapshotFromTypeEnum.*;
 import static com.ibeetl.jlw.enums.TuckOrErrorEnum.ERROR_TEST;
 import static com.ibeetl.jlw.enums.TuckOrErrorEnum.TUCK_TEST;
@@ -562,8 +564,27 @@ public class GeneralQuestionSettingService extends CoreBaseService<GeneralQuesti
         {
             // 做题日志关联学生, 初步提交做题日志信息，不包含学生提交的答案和得分情况
             generalQuestionLogService.preSubmitStudentQuestionLog(studentId, generalQuestionSettingId, null, resourcesQuestionSnapshots, selectIsReSend, coreUser);
+
+
+            // LOCK状态的题目，需要展示已经提交的答案，其他的答案还是需要隐藏的
+            GeneralQuestionLogQuery logQuery = new GeneralQuestionLogQuery();
+            logQuery.setGeneralQuestionSettingId(generalQuestionSettingId);
+            logQuery.setQuestionLogAddType(LOCK);
+            logQuery.setOrgId(coreUser.getOrgId());
+            logQuery.setUserId(coreUser.getId());
+            logQuery.setStudentId(studentId);
+            List<GeneralQuestionLog> logList = generalQuestionLogService.getValuesByQueryNotWithPermission(logQuery);
+
+            Set<Long> snapshotIdSet = logList.stream().map(GeneralQuestionLog::getGeneralResourcesQuestionSnapshotId).collect(Collectors.toSet());
+
             // 学生身份，需要屏蔽答案，再丢给前端
-            resourcesQuestionSnapshots.forEach(GeneralResourcesQuestionSnapshot::hideAnswer);
+            resourcesQuestionSnapshots.forEach(item -> {
+                // // LOCK状态的题目，需要展示已经提交的答案，其他的答案还是需要隐藏的
+                if (!snapshotIdSet.contains(item.getGeneralResourcesQuestionSnapshotId())) {
+                    item.hideAnswer();
+                }
+            });
+
         }
         // 考试自动交卷
         if (EnumUtil.contains(fromTypeEnum, EXAM)) {