|
@@ -317,7 +317,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
//考试登记
|
|
//考试登记
|
|
if(Validator.isNotEmpty(bo.getExamStatus())&&bo.getExamStatus()>0){
|
|
if(Validator.isNotEmpty(bo.getExamStatus())&&bo.getExamStatus()>0){
|
|
if(!checkCanExamResult(userSubscribeVo.getApplySiteEndTime(),userSubscribeVo.getApplySiteExamTime())){
|
|
if(!checkCanExamResult(userSubscribeVo.getApplySiteEndTime(),userSubscribeVo.getApplySiteExamTime())){
|
|
- throw new CustomException("考试时间未到,不能进行考试登记");
|
|
|
|
|
|
+ throw new CustomException("考试时间点未结束,不能进行考试登记");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if (bo.getSubscribeStatus() != null && bo.getSubscribeStatus().equals(2)) {
|
|
if (bo.getSubscribeStatus() != null && bo.getSubscribeStatus().equals(2)) {
|
|
@@ -392,7 +392,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
//考试登记
|
|
//考试登记
|
|
if(Validator.isNotEmpty(editBo.getExamStatus())&&editBo.getExamStatus()>0){
|
|
if(Validator.isNotEmpty(editBo.getExamStatus())&&editBo.getExamStatus()>0){
|
|
if(!checkCanExamResult(userSubscribeVo.getApplySiteEndTime(),userSubscribeVo.getApplySiteExamTime())){
|
|
if(!checkCanExamResult(userSubscribeVo.getApplySiteEndTime(),userSubscribeVo.getApplySiteExamTime())){
|
|
- throw new CustomException("考试时间未到,不能进行考试登记");
|
|
|
|
|
|
+ throw new CustomException("考试时间点未结束,不能进行考试登记");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if(editBo.getExamStatus().equals(1)){
|
|
if(editBo.getExamStatus().equals(1)){
|
|
@@ -551,7 +551,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
//考试登记
|
|
//考试登记
|
|
if(Validator.isNotEmpty(bo.getExamStatus())&&bo.getExamStatus()>0){
|
|
if(Validator.isNotEmpty(bo.getExamStatus())&&bo.getExamStatus()>0){
|
|
if(!checkCanExamResult(userSubscribeVo.getApplySiteEndTime(),userSubscribeVo.getApplySiteExamTime())){
|
|
if(!checkCanExamResult(userSubscribeVo.getApplySiteEndTime(),userSubscribeVo.getApplySiteExamTime())){
|
|
- throw new CustomException("考试时间未到,不能进行考试登记");
|
|
|
|
|
|
+ throw new CustomException("考试时间点未结束,不能进行考试登记");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
ExamApplyVo examApplyVo = examApplyMapper.selectByApply(userSubscribeVo.getApplyId());
|
|
ExamApplyVo examApplyVo = examApplyMapper.selectByApply(userSubscribeVo.getApplyId());
|
|
@@ -1402,7 +1402,7 @@ public class UserSubscribeServiceImpl extends ServiceImpl<UserSubscribeMapper, U
|
|
//考试登记
|
|
//考试登记
|
|
if(Validator.isNotEmpty(userSbusciEditBo.getExamStatus())&&userSbusciEditBo.getExamStatus()>0){
|
|
if(Validator.isNotEmpty(userSbusciEditBo.getExamStatus())&&userSbusciEditBo.getExamStatus()>0){
|
|
if(!checkCanExamResult(userSbusciEditBo.getApplySiteEndTime(),userSbusciEditBo.getApplySiteExamTime())){
|
|
if(!checkCanExamResult(userSbusciEditBo.getApplySiteEndTime(),userSbusciEditBo.getApplySiteExamTime())){
|
|
- userSubscribeImport.setCause("考试时间未到,不能进行考试登记");
|
|
|
|
|
|
+ userSubscribeImport.setCause("考试时间点未结束,不能进行考试登记");
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
userSubscribeImports.add(userSubscribeImport);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|