joylink/rt-sim-training-service
6
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 10 Wiki Activity

默认课程考试不分是否所属单位始终展示

Browse Source
This commit is contained in:
DU 2021-01-08 18:09:47 +08:00
parent c6f0df8b18
commit 5d65b4d50d
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/main/java/club/joylink/rtss/services/MapSystemService.java
View File

@ -225,21 +225,20 @@ public class MapSystemService implements IMapSystemService {
if(!CollectionUtils.isEmpty(departLessonRefs)){
lessonVOList = iLessonService.getValidLesson(departLessonRefs.stream().map(DepartmentLesson::getLessonId).collect(Collectors.toList()), mapSystem.getPrdType());
}
//默认课程展示
MapVO mapVO = iMapService.findMapBaseInfoById(mapSystem.getMapId());
BusinessConsts.Lesson.PrdInfo prdInfo = BusinessConsts.Lesson.PrdInfo.getBy(mapSystem.getPrdType());
if (Objects.nonNull(prdInfo)) {
String defaultLessonName = String.join("-", mapVO.getName(), prdInfo.getName());
LessonVO existedDefaultLesson = iLessonService.findByMapAndNameAndPrdType(mapSystem.getMapId(), defaultLessonName, mapSystem.getPrdType());
if (Objects.nonNull(existedDefaultLesson)) {
if (lessonVOList.stream().noneMatch(lessonVO -> lessonVO.getId().equals(existedDefaultLesson.getId()))) {
lessonVOList.add(existedDefaultLesson);
}
}
//默认课程展示
MapVO mapVO = iMapService.findMapBaseInfoById(mapSystem.getMapId());
BusinessConsts.Lesson.PrdInfo prdInfo = BusinessConsts.Lesson.PrdInfo.getBy(mapSystem.getPrdType());
if (Objects.nonNull(prdInfo)) {
String defaultLessonName = String.join("-", mapVO.getName(), prdInfo.getName());
LessonVO existedDefaultLesson = iLessonService.findByMapAndNameAndPrdType(mapSystem.getMapId(), defaultLessonName, mapSystem.getPrdType());
if (Objects.nonNull(existedDefaultLesson)) {
if (lessonVOList.stream().noneMatch(lessonVO -> lessonVO.getId().equals(existedDefaultLesson.getId()))) {
lessonVOList.add(existedDefaultLesson);
}
}
}
}
else{
} else{
lessonVOList = iLessonService.getByMapIdAndPrdType(mapSystem.getMapId(), mapSystem.getPrdType());
}