|
@@ -6,6 +6,7 @@ import com.qmth.themis.business.cache.bean.ExamActivityCacheBean;
|
|
|
import com.qmth.themis.business.cache.bean.ExamCacheBean;
|
|
|
import com.qmth.themis.business.cache.bean.ExamCourseCacheBean;
|
|
|
import com.qmth.themis.business.cache.bean.ExamStudentCacheBean;
|
|
|
+import com.qmth.themis.business.constant.SystemConstant;
|
|
|
import com.qmth.themis.business.enums.ExamModeEnum;
|
|
|
import io.swagger.annotations.ApiModelProperty;
|
|
|
|
|
@@ -81,9 +82,12 @@ public class TEExamActivityWaitDto implements Serializable {
|
|
|
this.minStartTime = ec.getStartTime();
|
|
|
}
|
|
|
if (Objects.nonNull(openingSeconds)) {
|
|
|
+ openingSeconds = openingSeconds.intValue() == 0 ? SystemConstant.DEFAULT_OPENING_SECONDS : openingSeconds;
|
|
|
this.maxStartTime = startTime + (openingSeconds * 1000);
|
|
|
} else if (Objects.nonNull(ec.getMaxDurationSeconds())) {
|
|
|
- this.maxStartTime = startTime + (ec.getOpeningSeconds() * 1000);
|
|
|
+ Integer openingSecondsTemp = ec.getOpeningSeconds();
|
|
|
+ openingSecondsTemp = Objects.nonNull(openingSecondsTemp) && openingSecondsTemp.intValue() == 0 ? SystemConstant.DEFAULT_OPENING_SECONDS : openingSecondsTemp;
|
|
|
+ this.maxStartTime = startTime + (openingSecondsTemp * 1000);
|
|
|
}
|
|
|
if (Objects.equals(ec.getMode(), ExamModeEnum.ANYTIME) || (Objects.equals(ec.getMode(), ExamModeEnum.TOGETHER) && forceFinish == 0)) {
|
|
|
this.maxFinishTime = null;
|