Merge remote-tracking branch 'origin/dev' into dev

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamServiceImpl.java

@@ -370,8 +370,12 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
             if (now.getTime() < start) {
                 throw new BusinessException("没有到允许开考的时间");
             }
-            if (now.getTime() > end) {
-                throw new BusinessException("允许开考的时间已结束");
+            //集中不启用统一收卷，考试快结束时，断点，再登录时， 时间已经超过考试截止时间，断点时，此时应该能登录继续作答
+            Integer forceFinish=ExamRecordCacheUtil.getForceFinish(recordId);
+            if(forceFinish!=null&&forceFinish.intValue()==1) {
+	            if (now.getTime() > end) {
+	                throw new BusinessException("允许开考的时间已结束");
+	            }
             }
         }
         ExamRecordStatusEnum sta = ExamRecordCacheUtil.getStatus(recordId);