|
@@ -224,6 +224,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodSectionVo.setModuleId(classPeriodVo.getId());
|
|
|
classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
|
|
|
classPeriodSectionVo.setGoodsId(bo.getGoodsId());
|
|
|
+ classPeriodSectionVo.setGradeId(bo.getGradeId());
|
|
|
}else {
|
|
|
UserPeriodQueryBo userPeriodQueryBo = new UserPeriodQueryBo();
|
|
|
userPeriodQueryBo.setExamId(classPeriodSectionVo.getId());
|
|
@@ -247,6 +248,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodSectionVo.setModuleId(classPeriodVo.getId());
|
|
|
classPeriodSectionVo.setChapterId(classPeriodChapterVo.getId());
|
|
|
classPeriodSectionVo.setGoodsId(bo.getGoodsId());
|
|
|
+ classPeriodSectionVo.setGradeId(bo.getGradeId());
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -280,6 +282,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodSectionVo.setModuleId(0L);
|
|
|
classPeriodSectionVo.setChapterId(classPeriodVo.getId());
|
|
|
classPeriodSectionVo.setGoodsId(bo.getGoodsId());
|
|
|
+ classPeriodSectionVo.setGradeId(bo.getGradeId());
|
|
|
}
|
|
|
List<ClassPeriodSectionVo> classPeriodSectionVos1 = baseMapper.listPeriodSectionExam(classPeriodVo.getId(), bo.getGoodsId(), classPeriodVo.getCourseId(), bo.getUserId());
|
|
|
for (ClassPeriodSectionVo classPeriodSectionVo : classPeriodSectionVos1) {
|
|
@@ -305,6 +308,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodSectionVo.setModuleId(0L);
|
|
|
classPeriodSectionVo.setChapterId(classPeriodVo.getId());
|
|
|
classPeriodSectionVo.setGoodsId(bo.getGoodsId());
|
|
|
+ classPeriodSectionVo.setGradeId(bo.getGradeId());
|
|
|
}
|
|
|
classPeriodSectionVos.addAll(classPeriodSectionVos1);
|
|
|
classPeriodVo.setClassPeriodSectionList(classPeriodSectionVos);
|
|
@@ -332,6 +336,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodVo.setModuleId(0L);
|
|
|
classPeriodVo.setChapterId(0L);
|
|
|
classPeriodVo.setGoodsId(bo.getGoodsId());
|
|
|
+ classPeriodVo.setGradeId(bo.getGradeId());
|
|
|
classPeriodVo.setUserPeriodStatusVos(userPeriodStatusVos);
|
|
|
}
|
|
|
|