Merge branch 'dev' of http://git.qmth.com.cn/themis/backend-service into dev

cccc

themis-business/src/main/java/com/qmth/themis/business/cache/ExamRecordCacheUtil.java

@@ -23,7 +23,7 @@ public class ExamRecordCacheUtil {
 	}
 
 	public static Long getExamStudentId(Long recordId) {
-		return (Long) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examStudentId");
+		return Long.parseLong(String.valueOf(redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "examStudentId")));
 	}
 
 	public static Long getPaperId(Long recordId) {

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

@@ -207,8 +207,9 @@ public class TEStudentController {
                 teExamService.finish(examStudentId, recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
             } else {//否则断点次数减1
                 leftBreakResumeCount--;
+                leftBreakResumeCount = leftBreakResumeCount <= 0 ? 0 : leftBreakResumeCount;
                 //如果断点次数超过了考试整体断点次数，也强制交卷
-                if (leftBreakResumeCount > ec.getBreakResumeCount()) {
+                if (leftBreakResumeCount < ec.getBreakResumeCount()) {
                     teExamService.finish(examStudentId, recordId, FinishTypeEnum.AUTO.name(), durationSeconds);
                 } else {
                     //更新考试记录