|
@@ -1163,10 +1163,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodUserVo.setSecAllNum(secLong);
|
|
|
//学习节数
|
|
|
classPeriodUserVo.setStuAllNum(studyLong);
|
|
|
- // classPeriodUserVo.setPending(classPeriodUserVo.getSecAllNum()-classPeriodUserVo.getPass()-classPeriodUserVo.getCheat());
|
|
|
- // classPeriodUserVo.setExamPending(classPeriodUserVo.getExamNum()-classPeriodUserVo.getExamPass()-classPeriodUserVo.getExamCheat());
|
|
|
+ classPeriodUserVo.setPending(classPeriodUserVo.getSecAllNum()-classPeriodUserVo.getPass()-classPeriodUserVo.getCheat());
|
|
|
+ classPeriodUserVo.setExamPending(classPeriodUserVo.getExamNum()-classPeriodUserVo.getExamPass()-classPeriodUserVo.getExamCheat());
|
|
|
//當前班級學員審核狀態 -1不可审核 0待審 1未通过 2通过
|
|
|
- /* if (classPeriodUserVo.getStuAllNum().equals(classPeriodUserVo.getSecAllNum()) && classPeriodUserVo.getExamNum().equals(classPeriodUserVo.getRecordNum())){
|
|
|
+ if (classPeriodUserVo.getStuAllNum().equals(classPeriodUserVo.getSecAllNum()) && classPeriodUserVo.getExamNum().equals(classPeriodUserVo.getRecordNum())){
|
|
|
if (classPeriodUserVo.getPending() != 0 || classPeriodUserVo.getExamPending() != 0){
|
|
|
classPeriodUserVo.setAllStatus(0);
|
|
|
}else if (classPeriodUserVo.getCheat() != 0 || classPeriodUserVo.getExamCheat() != 0){
|
|
@@ -1176,8 +1176,8 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
}
|
|
|
}else {
|
|
|
classPeriodUserVo.setAllStatus(-1);
|
|
|
- }*/
|
|
|
- classPeriodUserVo.setAllStatus(changePeriodStatus(new Long(classPeriodUserVo.getPeriodStatus())));
|
|
|
+ }
|
|
|
+ // classPeriodUserVo.setAllStatus(changePeriodStatus(new Long(classPeriodUserVo.getPeriodStatus())));
|
|
|
}
|
|
|
return classPeriodUserVos;
|
|
|
}
|