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 CoreBaseServicequeryByCondition(PageQuery query){ PageQuery ret = handsOnSimulationTasksDao.queryByCondition(query); queryListAfter(ret.getList()); @@ -294,12 +295,12 @@ public class HandsOnSimulationTasksService extends CoreBaseService(); } HandsOnSimulationTasks info = taskId == null ? null : getInfo(taskId); - List resourcesQuestions = StringUtils.isNotEmpty(problemIds) + List resourcesQuestions = StringUtils.isNotEmpty(problemIds) ? mergeResourcesQuestionService.getByIds(problemIds) : null; if (CollectionUtils.isEmpty(resourcesQuestions)) { return new ArrayList<>(); } - Map> questions = resourcesQuestions.stream().collect(Collectors.groupingBy(TeacherOpenCourseMergeResourcesQuestion::getQuestionType)); + Map> questions = resourcesQuestions.stream().collect(Collectors.groupingBy(ResourcesQuestion::getQuestionType)); List list = new ArrayList<>(); questions.forEach((k, v) -> { HandsOnTaskProblemVO handsOnTaskProblemVo = new HandsOnTaskProblemVO();