Merge branch 'dev'

1111

themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -123,7 +123,7 @@
             UNIX_TIMESTAMP(date_sub(teea.start_time, interval IFNULL(teea.prepare_seconds, tee.prepare_seconds) second)) * 1000 as prepareTime,
             UNIX_TIMESTAMP(date_add(teea.start_time, interval tee.min_duration_seconds second)) * 1000 as minStartTime,
             UNIX_TIMESTAMP(date_add(teea.start_time, interval IFNULL(teea.max_duration_seconds, tee.max_duration_seconds) second)) * 1000 as maxStartTime,
-            UNIX_TIMESTAMP(IFNULL(teea.finish_time , tee.end_time)) * 1000 as maxFinishTime,
+            IF(tee.mode = 'TOGETHER', UNIX_TIMESTAMP(IFNULL(teea.finish_time , tee.end_time)) * 1000, null) as maxFinishTime,
             tee.monitor_video_source as monitorVideoSourceStr,
             tee.prepare_seconds as prepareSeconds,
             teea.prepare_seconds as activityPrepareSeconds,

themis-exam/src/main/java/com/qmth/themis/exam/api/TEStudentController.java

@@ -23,7 +23,6 @@ import com.qmth.themis.business.entity.TEConfig;
 import com.qmth.themis.business.entity.TEStudent;
 import com.qmth.themis.business.enums.*;
 import com.qmth.themis.business.service.*;
-import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.business.util.ServletUtil;
 import com.qmth.themis.business.util.SessionUtil;
@@ -301,6 +300,9 @@ public class TEStudentController {
         TEExamActivityDto teExamActivityDto = new TEExamActivityDto(ec, examActivityCacheBean, examStudentCacheBean, examStudentId, examCourseCacheBean);
         Gson gson = new Gson();
         ExamActivityUnFinishBean examActivityUnFinishBean = gson.fromJson(gson.toJson(teExamActivityDto), ExamActivityUnFinishBean.class);
+        if (Objects.equals(ec.getMode(), ExamModeEnum.ANYTIME)) {
+            examActivityUnFinishBean.setMaxFinishTime(null);
+        }
         examActivityUnFinishBean.setRecordId(recordId);
         return new ExamUnFinishBean(ec.getId(), ec.getName(), ec.getPreNotice(), ec.getPreNoticeStaySeconds(), ec.getPostNotice(), examActivityUnFinishBean);
     }