|
@@ -213,7 +213,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
|
|
|
userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
|
|
|
userPeriodQueryBo.setModuleId(classPeriodVo.getId());
|
|
|
- userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
|
|
|
+ userPeriodQueryBo.setGradeId(bo.getGradeId());
|
|
|
List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(userPeriodStatusVos)) {
|
|
|
int numIndex = userPeriodStatusVos.size() - 1;
|
|
@@ -242,7 +242,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
|
|
|
userPeriodQueryBo.setChapterId(classPeriodChapterVo.getId());
|
|
|
userPeriodQueryBo.setModuleId(classPeriodVo.getId());
|
|
|
- userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
|
|
|
+ userPeriodQueryBo.setGradeId(bo.getGradeId());
|
|
|
List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(userPeriodStatusVos)) {
|
|
|
int numIndex = userPeriodStatusVos.size() - 1;
|
|
@@ -281,7 +281,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
|
|
|
userPeriodQueryBo.setChapterId(classPeriodVo.getId());
|
|
|
userPeriodQueryBo.setModuleId(0L);
|
|
|
- userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
|
|
|
+ userPeriodQueryBo.setGradeId(bo.getGradeId());
|
|
|
List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(userPeriodStatusVos)){
|
|
|
int numIndex = userPeriodStatusVos.size() - 1;
|
|
@@ -312,7 +312,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
userPeriodQueryBo.setUserId(classPeriodSectionVo.getUserId());
|
|
|
userPeriodQueryBo.setChapterId(classPeriodVo.getId());
|
|
|
userPeriodQueryBo.setModuleId(0L);
|
|
|
- userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
|
|
|
+ userPeriodQueryBo.setGradeId(bo.getGradeId());
|
|
|
List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(userPeriodStatusVos)) {
|
|
|
int numIndex = userPeriodStatusVos.size() - 1;
|
|
@@ -345,7 +345,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
userPeriodQueryBo.setUserId(classPeriodVo.getUserId());
|
|
|
userPeriodQueryBo.setChapterId(0L);
|
|
|
userPeriodQueryBo.setModuleId(0L);
|
|
|
- userPeriodQueryBo.setGradeId(classPeriodVo.getGradeId());
|
|
|
+ userPeriodQueryBo.setGradeId(bo.getGradeId());
|
|
|
List<UserPeriodStatusVo> userPeriodStatusVos = userPeriodStatusService.selectPeriodStatus(userPeriodQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(userPeriodStatusVos)){
|
|
|
int numIndex = userPeriodStatusVos.size() - 1;
|