|
@@ -1161,22 +1161,21 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
if (examStage.getHasValue() && !examStage.getEnable()) {
|
|
if (examStage.getHasValue() && !examStage.getEnable()) {
|
|
return;
|
|
return;
|
|
}
|
|
}
|
|
|
|
+ }
|
|
|
|
|
|
- if (end) {
|
|
|
|
- Calendar calendar = Calendar.getInstance();
|
|
|
|
- calendar.setTime(examBean.getEndTime());
|
|
|
|
- calendar.add(Calendar.DATE, 30);
|
|
|
|
- Date leftTime = calendar.getTime();
|
|
|
|
- //已结束且结束时间30天以内的
|
|
|
|
- if(now.after(leftTime)||now.before(examBean.getEndTime())){
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
- } else {
|
|
|
|
- if (now.after(examBean.getEndTime())) {
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
|
|
+ if (end) {
|
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
|
+ calendar.setTime(examBean.getEndTime());
|
|
|
|
+ calendar.add(Calendar.DATE, 30);
|
|
|
|
+ Date leftTime = calendar.getTime();
|
|
|
|
+ //已结束且结束时间30天以内的
|
|
|
|
+ if(now.after(leftTime)||now.before(examBean.getEndTime())){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+ } else {
|
|
|
|
+ if (now.after(examBean.getEndTime())) {
|
|
|
|
+ return;
|
|
}
|
|
}
|
|
-
|
|
|
|
}
|
|
}
|
|
|
|
|
|
OnHandExamInfo examStudentInfo = new OnHandExamInfo();
|
|
OnHandExamInfo examStudentInfo = new OnHandExamInfo();
|