Merge remote-tracking branch 'origin/beetlsql3-dev' into beetlsql3-dev

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();