Merge branch 'dev' into release

# Conflicts:
#	themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamActivityDto.java

themis-business/src/main/java/com/qmth/themis/business/dto/response/TEExamActivityDto.java

@@ -1,12 +1,5 @@
 package com.qmth.themis.business.dto.response;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
-import com.qmth.themis.business.cache.ExamRecordCacheUtil;
 import com.qmth.themis.business.cache.bean.ExamActivityCacheBean;
 import com.qmth.themis.business.cache.bean.ExamCacheBean;
 import com.qmth.themis.business.cache.bean.ExamCourseCacheBean;
@@ -15,9 +8,11 @@ import com.qmth.themis.business.enums.EntryAuthenticationPolicyEnum;
 import com.qmth.themis.business.enums.ExamModeEnum;
 import com.qmth.themis.business.enums.HardwareTestEnum;
 import com.qmth.themis.business.enums.MonitorVideoSourceEnum;
-
 import io.swagger.annotations.ApiModelProperty;
 
+import java.io.Serializable;
+import java.util.*;
+
 /**
  * @Description: 考试场次dto
  * @Param:
@@ -184,12 +179,12 @@ public class TEExamActivityDto implements Serializable {
         } else {
             this.setMonitorVideoSource(null);
         }
-        this.openingSeconds = ec.getOpeningSeconds();
+        this.openingSeconds = Objects.nonNull(examActivityCacheBean.getOpeningSeconds()) ? examActivityCacheBean.getOpeningSeconds() : ec.getOpeningSeconds();
         this.activityOpeningSeconds = examActivityCacheBean.getOpeningSeconds();
-        this.prepareSeconds = ec.getPrepareSeconds();
+        this.prepareSeconds = Objects.nonNull(examActivityCacheBean.getPrepareSeconds()) ? examActivityCacheBean.getPrepareSeconds() : ec.getPrepareSeconds();
         this.activityPrepareSeconds = examActivityCacheBean.getPrepareSeconds();
         this.minDurationSeconds = ec.getMinDurationSeconds();
-        this.maxDurationSeconds = ec.getMaxDurationSeconds();
+        this.maxDurationSeconds = Objects.nonNull(examActivityCacheBean.getMaxDurationSeconds()) ? examActivityCacheBean.getMaxDurationSeconds() : ec.getMaxDurationSeconds();
         this.activityMaxDurationSeconds = examActivityCacheBean.getMaxDurationSeconds();
         this.examCount = ec.getExamCount();
         this.forceFinish = ec.getForceFinish();