From 38274b739b45518c961a48a19fa1fd03b865939a Mon Sep 17 00:00:00 2001
From: xuliangtong <1124839262@qq.com>
Date: Tue, 7 Feb 2023 14:34:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E5=AE=9E=E8=AE=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ibeetl/jlw/service/HandsOnSimulationTasksService.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
index 675b18dd..c8019ee0 100644
--- a/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
+++ b/web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
@@ -9,6 +9,7 @@ import com.ibeetl.admin.core.util.PlatformException;
 import com.ibeetl.admin.core.web.JsonResult;
 import com.ibeetl.admin.core.web.JsonReturnCode;
 import com.ibeetl.jlw.dao.HandsOnSimulationTasksDao;
+import com.ibeetl.jlw.dao.ResourcesQuestionDao;
 import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
 import com.ibeetl.jlw.entity.*;
 import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
@@ -40,7 +41,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
     @Autowired private HandsOnSimulationTasksDao handsOnSimulationTasksDao;
     @Autowired private HandsOnSimulationTasksFileService handsOnSimulationTasksFileService;
     @Autowired private HandsOnSimulationTasksAssessmentService handsOnSimulationTasksAssessmentService;
-    @Autowired private TeacherOpenCourseMergeResourcesQuestionDao mergeResourcesQuestionService;
+    @Autowired private ResourcesQuestionDao mergeResourcesQuestionService;
     public PageQuery<HandsOnSimulationTasks>queryByCondition(PageQuery query){
         PageQuery ret =  handsOnSimulationTasksDao.queryByCondition(query);
         queryListAfter(ret.getList());
@@ -294,12 +295,12 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
             return new ArrayList<>();
         }
         HandsOnSimulationTasks info = taskId == null ? null : getInfo(taskId);
-        List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = StringUtils.isNotEmpty(problemIds)
+        List<ResourcesQuestion> resourcesQuestions = StringUtils.isNotEmpty(problemIds)
                 ? mergeResourcesQuestionService.getByIds(problemIds) : null;
         if (CollectionUtils.isEmpty(resourcesQuestions)) {
             return new ArrayList<>();
         }
-        Map<Integer, List<TeacherOpenCourseMergeResourcesQuestion>> questions = resourcesQuestions.stream().collect(Collectors.groupingBy(TeacherOpenCourseMergeResourcesQuestion::getQuestionType));
+        Map<Integer, List<ResourcesQuestion>> questions = resourcesQuestions.stream().collect(Collectors.groupingBy(ResourcesQuestion::getQuestionType));
         List<HandsOnTaskProblemVO> list = new ArrayList<>();
         questions.forEach((k, v) -> {
             HandsOnTaskProblemVO handsOnTaskProblemVo = new HandsOnTaskProblemVO();