tianzeOrg
/
tianze-pro
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
beetlsql3-dev
Mlxa0324 2 years ago
parent dd57321137 38274b739b
commit bf1166f6bd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File

7
web/src/main/java/com/ibeetl/jlw/service/HandsOnSimulationTasksService.java
Unescape Escape View File

@ -9,6 +9,7 @@ import com.ibeetl.admin.core.util.PlatformException;
import com.ibeetl.admin.core.web.JsonResult; import com.ibeetl.admin.core.web.JsonResult;
import com.ibeetl.admin.core.web.JsonReturnCode; import com.ibeetl.admin.core.web.JsonReturnCode;
import com.ibeetl.jlw.dao.HandsOnSimulationTasksDao; import com.ibeetl.jlw.dao.HandsOnSimulationTasksDao;
import com.ibeetl.jlw.dao.ResourcesQuestionDao;
import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao; import com.ibeetl.jlw.dao.TeacherOpenCourseMergeResourcesQuestionDao;
import com.ibeetl.jlw.entity.*; import com.ibeetl.jlw.entity.*;
import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO; import com.ibeetl.jlw.entity.vo.HandsOnTaskProblemVO;
@ -40,7 +41,7 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
@Autowired private HandsOnSimulationTasksDao handsOnSimulationTasksDao; @Autowired private HandsOnSimulationTasksDao handsOnSimulationTasksDao;
@Autowired private HandsOnSimulationTasksFileService handsOnSimulationTasksFileService; @Autowired private HandsOnSimulationTasksFileService handsOnSimulationTasksFileService;
@Autowired private HandsOnSimulationTasksAssessmentService handsOnSimulationTasksAssessmentService; @Autowired private HandsOnSimulationTasksAssessmentService handsOnSimulationTasksAssessmentService;
@Autowired private TeacherOpenCourseMergeResourcesQuestionDao mergeResourcesQuestionService; @Autowired private ResourcesQuestionDao mergeResourcesQuestionService;
public PageQuery<HandsOnSimulationTasks>queryByCondition(PageQuery query){ public PageQuery<HandsOnSimulationTasks>queryByCondition(PageQuery query){
PageQuery ret = handsOnSimulationTasksDao.queryByCondition(query); PageQuery ret = handsOnSimulationTasksDao.queryByCondition(query);
queryListAfter(ret.getList()); queryListAfter(ret.getList());
@ -294,12 +295,12 @@ public class HandsOnSimulationTasksService extends CoreBaseService<HandsOnSimula
return new ArrayList<>(); return new ArrayList<>();
} }
HandsOnSimulationTasks info = taskId == null ? null : getInfo(taskId); HandsOnSimulationTasks info = taskId == null ? null : getInfo(taskId);
List<TeacherOpenCourseMergeResourcesQuestion> resourcesQuestions = StringUtils.isNotEmpty(problemIds) List<ResourcesQuestion> resourcesQuestions = StringUtils.isNotEmpty(problemIds)
? mergeResourcesQuestionService.getByIds(problemIds) : null; ? mergeResourcesQuestionService.getByIds(problemIds) : null;
if (CollectionUtils.isEmpty(resourcesQuestions)) { if (CollectionUtils.isEmpty(resourcesQuestions)) {
return new ArrayList<>(); 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<>(); List<HandsOnTaskProblemVO> list = new ArrayList<>();
questions.forEach((k, v) -> { questions.forEach((k, v) -> {
HandsOnTaskProblemVO handsOnTaskProblemVo = new HandsOnTaskProblemVO(); HandsOnTaskProblemVO handsOnTaskProblemVo = new HandsOnTaskProblemVO();

Write Preview
Loading…
Cancel
Save