|
@@ -295,7 +295,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
}
|
|
|
ClassGradeUserQueryBo queryBo = new ClassGradeUserQueryBo();
|
|
|
queryBo.setGradeId(bo.getGradeId());
|
|
|
- queryBo.setGoodsId(bo.getGoodsId());
|
|
|
queryBo.setUserId(bo.getUserId());
|
|
|
ClassPeriodStudentVo classPeriodStudentVo = baseMapper.userPeriodStatus(queryBo);
|
|
|
Long secLong = 0L;
|
|
@@ -323,53 +322,35 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
classGradeUserQueryBo.setGradeId(bo.getGradeId());
|
|
|
classGradeUserQueryBo.setUserId(bo.getUserId());
|
|
|
classGradeUserQueryBo.setGoodsId(classPeriodStudentVo.getGoodsId());
|
|
|
- System.out.println(classGradeUserQueryBo);
|
|
|
List<ClassPeriodUserVo> classPeriodUserVos1 = baseMapper.listPeriod(classGradeUserQueryBo);
|
|
|
- System.out.println(classPeriodUserVos1);
|
|
|
- System.out.println(classPeriodUserVos1.size()+"我的数量");
|
|
|
ClassPeriodUserVo classPeriodUserVos = classPeriodUserVos1.get(0);
|
|
|
classPeriodUserVos.setPending(classPeriodStudentVo.getSecAllNum()-classPeriodUserVos.getPass()-classPeriodUserVos.getCheat());
|
|
|
classPeriodUserVos.setExamPending(classPeriodUserVos.getExamNum()-classPeriodUserVos.getExamPass()-classPeriodUserVos.getExamCheat());
|
|
|
//當前班級學員審核狀態 -1不可审核 0待審 1未通过 2通过
|
|
|
Integer gradePeriodStatus = 0; //班级里的审核状态字段,保持一致 0 未通过 1通过 2待审核 -1 不可审核
|
|
|
- System.out.println(classPeriodStudentVo.getSecAllNum());
|
|
|
- System.out.println(classPeriodStudentVo.getStuAllNum());
|
|
|
- System.out.println(classPeriodUserVos.getExamPending());
|
|
|
- System.out.println(classPeriodUserVos.getPending());
|
|
|
- System.out.println(classPeriodUserVos.getCheat());
|
|
|
- System.out.println(classPeriodUserVos.getExamCheat());
|
|
|
- System.out.println(classPeriodStudentVo.getExamNum());
|
|
|
- System.out.println(classPeriodStudentVo.getRecordNum());
|
|
|
if(Validator.isEmpty(classPeriodStudentVo.getSecAllNum())||classPeriodStudentVo.getSecAllNum()==0){
|
|
|
//空课程
|
|
|
classPeriodStudentVo.setAllStatus(-1);
|
|
|
gradePeriodStatus = -1;
|
|
|
- System.out.println("CC");
|
|
|
}else{
|
|
|
if(classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum())){
|
|
|
- System.out.println("CCS");
|
|
|
}
|
|
|
if(classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
|
|
|
- System.out.println("CCSVVV");
|
|
|
}
|
|
|
if (classPeriodStudentVo.getStuAllNum().equals(classPeriodStudentVo.getSecAllNum()) && classPeriodStudentVo.getExamNum().equals(classPeriodStudentVo.getRecordNum())){
|
|
|
if (classPeriodUserVos.getPending() != 0 || classPeriodUserVos.getExamPending() != 0){
|
|
|
classPeriodStudentVo.setAllStatus(0);
|
|
|
gradePeriodStatus = 2;
|
|
|
- System.out.println("CCD");
|
|
|
}else if (classPeriodUserVos.getCheat() != 0 || classPeriodUserVos.getExamCheat() != 0){
|
|
|
classPeriodStudentVo.setAllStatus(1);
|
|
|
gradePeriodStatus = 0;
|
|
|
- System.out.println("CCDV");
|
|
|
}else {
|
|
|
classPeriodStudentVo.setAllStatus(2);
|
|
|
gradePeriodStatus = 1;
|
|
|
- System.out.println("CCDVV");
|
|
|
}
|
|
|
}else {
|
|
|
classPeriodStudentVo.setAllStatus(-1);
|
|
|
gradePeriodStatus = -1;
|
|
|
- System.out.println("SSS");
|
|
|
}
|
|
|
}
|
|
|
LambdaQueryWrapper<ClassGradeUser> classGradeUser = Wrappers.lambdaQuery();
|
|
@@ -395,8 +376,6 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- System.out.println(gradePeriodStatus);
|
|
|
- System.out.println(classPeriodStudentVo.getAllStatus());
|
|
|
classGradeUser1.setUpdateTime(DateUtils.getNowTime());
|
|
|
iClassGradeUserService.update(classGradeUser1, classGradeUser);
|
|
|
return gradePeriodStatus;
|