From 9dbdb03d4e922b4518b4b36f81906599a205043a Mon Sep 17 00:00:00 2001
From: maLix <mlx950324@163.com>
Date: Sun, 16 Jul 2023 23:34:35 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../StudentHandsOnTaskTheoryService.java       | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
index 8bbc5018..c3f06866 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/StudentHandsOnTaskTheoryService.java
@@ -63,7 +63,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
     @Autowired
     @Lazy
     private TeacherOpenCourseHandsOnSimulationTasksService teacherOpenCourseHandsOnSimulationTasksService;
-    @Autowired private TeacherOpenCourseMergeResourcesQuestionService questionService;
+    @Autowired private TeacherOpenCourseMergeResourcesQuestionService teacherOpenCourseMergeResourcesQuestionService;
     //存储学生临时答题
     public static ConcurrentHashMap<String, Map<String, Object>> questions = new ConcurrentHashMap<>();
 
@@ -401,7 +401,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         String taskList = tasks.getTaskList();
         TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
         questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
-        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
+        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
         if (CollectionUtils.isEmpty(resourcesQuestions)) {
             return JsonResult.success(resourcesQuestions);
         }
@@ -460,10 +460,20 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
         questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
         questionQuery.setQuestionStatus(1);
-        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
+        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
         if (CollectionUtils.isEmpty(resourcesQuestions)) {
             return JsonResult.success(resourcesQuestions);
         }
+
+        // 如果是已经做过的题，就把学生的题目分数带过来
+        resourcesQuestions.forEach(item -> {
+            boolean contains = ArrayUtil.contains(taskList.split(","), item.getTeacherOpenCourseMergeResourcesQuestionId().toString());
+
+            if (contains) {
+                item.setQuestionScore(tasks.getSingleScore());
+            }
+        });
+
         return JsonResult.success(resourcesQuestions);
     }
 
@@ -521,7 +531,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService<StudentHand
         String taskList = tasks.getTaskList();
         TeacherOpenCourseMergeResourcesQuestionQuery questionQuery = new TeacherOpenCourseMergeResourcesQuestionQuery();
         questionQuery.setTeacherOpenCourseMergeResourcesQuestionIdPlural(taskList);
-        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery);
+        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery);
 
         List<StudentHandsOnTaskTheory> taskTheoryList = new ArrayList<>();
         for (TeacherOpenCourseMergeResourcesQuestionVO resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) {