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> questions = new ConcurrentHashMap<>(); @@ -401,7 +401,7 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery); + List resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery); if (CollectionUtils.isEmpty(resourcesQuestions)) { return JsonResult.success(resourcesQuestions); } @@ -460,10 +460,20 @@ public class StudentHandsOnTaskTheoryService extends CoreBaseService resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery); + List 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 resourcesQuestions = questionService.getValuesByQueryNotWithPermission(questionQuery); + List resourcesQuestions = teacherOpenCourseMergeResourcesQuestionService.getValuesByQueryNotWithPermission(questionQuery); List taskTheoryList = new ArrayList<>(); for (TeacherOpenCourseMergeResourcesQuestionVO resourcesQuestion : teacherOpenCourseMergeResourcesQuestionQueries) {