|
@@ -306,7 +306,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
|
|
|
ClassGradeUser classGradeUser1 = new ClassGradeUser();
|
|
|
classGradeUser1.setPeriodStatus(gradePeriodStatus);
|
|
|
- classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
|
|
|
+ if(gradePeriodStatus==2){
|
|
|
+ classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
|
|
|
+ }
|
|
|
classGradeUser1.setUpdateTime(DateUtils.getNowTime());
|
|
|
iClassGradeUserService.update(classGradeUser1, classGradeUser);
|
|
|
return null;
|
|
@@ -410,13 +412,15 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classPeriodStudentVo.setAllStatus(-1);
|
|
|
gradePeriodStatus = -1;
|
|
|
}
|
|
|
- if(gradePeriodStatus.equals(classPeriodStudentVo.getPeriodStatus())){
|
|
|
+ if(!gradePeriodStatus.equals(classPeriodStudentVo.getPeriodStatus())){
|
|
|
LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
|
|
|
- classGradeUser.eq(ClassGradeUser::getUserId, bo.getUserId());
|
|
|
- classGradeUser.eq(ClassGradeUser::getGradeId, bo.getGradeId());
|
|
|
+ classGradeUser.eq(ClassGradeUser::getUserId, classPeriodStudentVo.getUserId());
|
|
|
+ classGradeUser.eq(ClassGradeUser::getGradeId, classPeriodStudentVo.getGradeId());
|
|
|
ClassGradeUser classGradeUser1 = new ClassGradeUser();
|
|
|
classGradeUser1.setPeriodStatus(gradePeriodStatus);
|
|
|
- classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
|
|
|
+ if(gradePeriodStatus==2){
|
|
|
+ classGradeUser1.setPeriodWaitTime(DateUtils.getNowTime());
|
|
|
+ }
|
|
|
classGradeUser1.setUpdateTime(DateUtils.getNowTime());
|
|
|
iClassGradeUserService.update(classGradeUser1, classGradeUser);
|
|
|
}
|