|
@@ -194,6 +194,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
@Override
|
|
|
public List<GoodsPeriodVo> listGoodsPeriodVo(UserPlanQueryBo bo) {
|
|
|
List<GoodsPeriodVo> goodsPeriodVos = baseMapper.listGoodsPeriodVo(bo);
|
|
|
+ //查询学习记录,学时审核状态
|
|
|
for (GoodsPeriodVo goodsPeriodVo : goodsPeriodVos) {
|
|
|
Long secLong = 0L;
|
|
|
Long studyLong = 0L;
|
|
@@ -201,6 +202,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
subjectStudyRecordQueryBo.setGoodsId(goodsPeriodVo.getGoodsId());
|
|
|
subjectStudyRecordQueryBo.setUserId(bo.getUserId());
|
|
|
subjectStudyRecordQueryBo.setGradeId(goodsPeriodVo.getGradeId());
|
|
|
+ //学时审核状态
|
|
|
List<SubjectStudyRecordVo> subjectStudyRecordVos = iUserStudyRecordService.listSubject(subjectStudyRecordQueryBo);
|
|
|
if (!CollectionUtils.isEmpty(subjectStudyRecordVos)) {
|
|
|
for (SubjectStudyRecordVo subjectStudyRecordVo : subjectStudyRecordVos) {
|
|
@@ -209,6 +211,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
|
|
|
}
|
|
|
goodsPeriodVo.setPending(secLong-goodsPeriodVo.getPass()-goodsPeriodVo.getCheat());
|
|
|
goodsPeriodVo.setExamPending(goodsPeriodVo.getExamNum()-goodsPeriodVo.getExamPass()-goodsPeriodVo.getExamCheat());
|
|
|
+ //学时审核状态 -1 不可审核 1通过审核 2待审 3不通过
|
|
|
if (secLong.equals(studyLong) && goodsPeriodVo.getExamNum().equals(goodsPeriodVo.getRecordNum())) {
|
|
|
if (goodsPeriodVo.getCheat() != 0 || goodsPeriodVo.getExamCheat() != 0) {
|
|
|
goodsPeriodVo.setPeriodStatus(3L);
|