|
@@ -1075,6 +1075,12 @@ public class ClassGradeServiceImpl extends ServiceImpl<ClassGradeMapper, ClassGr
|
|
}else{
|
|
}else{
|
|
exportVo.setStudyStatusStr("已完成");
|
|
exportVo.setStudyStatusStr("已完成");
|
|
}
|
|
}
|
|
|
|
+ if(Validator.isEmpty(classGradeStudentVo.getStudyCount())){
|
|
|
|
+ classGradeStudentVo.setStudyCount(0L);
|
|
|
|
+ }
|
|
|
|
+ if(Validator.isEmpty(classGradeStudentVo.getUseStudyCount())){
|
|
|
|
+ classGradeStudentVo.setUseStudyCount(0);
|
|
|
|
+ }
|
|
exportVo.setTotalStudyCount(classGradeStudentVo.getUseStudyCount()+classGradeStudentVo.getStudyCount().intValue());
|
|
exportVo.setTotalStudyCount(classGradeStudentVo.getUseStudyCount()+classGradeStudentVo.getStudyCount().intValue());
|
|
if(Validator.isNotEmpty(classGradeStudentVo.getUserStatus())&&classGradeStudentVo.getUserStatus()==1){
|
|
if(Validator.isNotEmpty(classGradeStudentVo.getUserStatus())&&classGradeStudentVo.getUserStatus()==1){
|
|
exportVo.setUserStatus("变更");
|
|
exportVo.setUserStatus("变更");
|