|
@@ -381,6 +381,9 @@ public class ExamReserveServiceImpl implements ExamReserveService {
|
|
return new ArrayList<>();
|
|
return new ArrayList<>();
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ // 自主预约全局开关
|
|
|
|
+ boolean globalOpen = systemPropertyService.existPropValue(curApplyTask.getOrgId(), Constants.APPLY_SWITCH, Constants.APPLY_SWITCH_OPEN);
|
|
|
|
+
|
|
// 考前N天,禁止考生自主取消预约
|
|
// 考前N天,禁止考生自主取消预约
|
|
Date allowDate = DateUtil.changeDateAndTimeEnd(new Date(), curApplyTask.getAllowApplyCancelDays());
|
|
Date allowDate = DateUtil.changeDateAndTimeEnd(new Date(), curApplyTask.getAllowApplyCancelDays());
|
|
|
|
|
|
@@ -396,7 +399,7 @@ public class ExamReserveServiceImpl implements ExamReserveService {
|
|
}
|
|
}
|
|
|
|
|
|
Date curDate = new Date(vo.getTimePeriodStart());
|
|
Date curDate = new Date(vo.getTimePeriodStart());
|
|
- if (curDate.after(allowDate)) {
|
|
|
|
|
|
+ if (curDate.after(allowDate) && globalOpen) {
|
|
// “当前时段开始时间”在“允许取消时间”之后,可以取消预约
|
|
// “当前时段开始时间”在“允许取消时间”之后,可以取消预约
|
|
vo.setAllowCancel(true);
|
|
vo.setAllowCancel(true);
|
|
}
|
|
}
|