|
|
@@ -124,28 +124,28 @@ public class CourseModuleChapterServiceImpl extends ServiceImpl<CourseModuleChap
|
|
|
courseUserModuleChapterVos.addAll(examList);
|
|
|
}
|
|
|
|
|
|
- //获得重修目录
|
|
|
- if (bo.getRebuild() != null && bo.getRebuild() == 1){
|
|
|
- for (CourseUserModuleChapterVo courseUserModuleChapterVo : courseUserModuleChapterVos) {
|
|
|
- if (courseUserModuleChapterVo.getModuleId() == null){
|
|
|
- bo.setModuleId(0L);
|
|
|
- }
|
|
|
- if(courseUserModuleChapterVo.getType()==1){
|
|
|
- //查询章是否重修章
|
|
|
- Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),courseUserModuleChapterVo.getChapterId(), courseUserModuleChapterVo.getGradeId(), bo.getUserId(),null);
|
|
|
- if (rebuild > 0) {
|
|
|
- courseUserModuleChapterVo.setRebuild(1);
|
|
|
- }
|
|
|
+ for (CourseUserModuleChapterVo courseUserModuleChapterVo : courseUserModuleChapterVos) {
|
|
|
+ if (courseUserModuleChapterVo.getModuleId() == null){
|
|
|
+ bo.setModuleId(0L);
|
|
|
+ }
|
|
|
+ if(courseUserModuleChapterVo.getType()==1){
|
|
|
+ //查询章是否重修章
|
|
|
+ Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),courseUserModuleChapterVo.getChapterId(), courseUserModuleChapterVo.getGradeId(), bo.getUserId(),null);
|
|
|
+ if (rebuild > 0) {
|
|
|
+ courseUserModuleChapterVo.setRebuild(1);
|
|
|
}
|
|
|
- if(courseUserModuleChapterVo.getType()==2){
|
|
|
- //查询模块卷是否重修
|
|
|
- Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),null, courseUserModuleChapterVo.getGradeId(), bo.getUserId(),courseUserModuleChapterVo.getTypeId());
|
|
|
- if (rebuild > 0) {
|
|
|
- courseUserModuleChapterVo.setRebuild(1);
|
|
|
- }
|
|
|
+ }
|
|
|
+ if(courseUserModuleChapterVo.getType()==2){
|
|
|
+ //查询模块卷是否重修
|
|
|
+ Integer rebuild = baseMapper.rebuildChapterCheck(courseUserModuleChapterVo.getModuleId(),null, courseUserModuleChapterVo.getGradeId(), bo.getUserId(),courseUserModuleChapterVo.getTypeId());
|
|
|
+ if (rebuild > 0) {
|
|
|
+ courseUserModuleChapterVo.setRebuild(1);
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
+ //获得重修目录
|
|
|
+ if (bo.getRebuild() != null && bo.getRebuild() == 1){
|
|
|
List<CourseUserModuleChapterVo> courseUserModuleChapterVoList = courseUserModuleChapterVos.stream().filter(s ->
|
|
|
s.getRebuild() != null && s.getRebuild().equals(1)
|
|
|
).collect(Collectors.toList());
|