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

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

@@ -81,6 +81,10 @@ public class ExamRecordCacheUtil {
 	public static Integer getLeftBreakResumeCount(Long recordId) {
 		return (Integer) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "leftBreakResumeCount");
 	}
+	
+	public static void setLeftBreakResumeCount(Long recordId,Integer leftBreakResumeCount) {
+		redisUtil.set(RedisKeyHelper.examRecordCacheKey(recordId), "leftBreakResumeCount",leftBreakResumeCount);
+	}
 
 	public static ExamRecordStatusEnum getStatus(Long recordId) {
 		return (ExamRecordStatusEnum) redisUtil.get(RedisKeyHelper.examRecordCacheKey(recordId), "status");

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

@@ -248,12 +248,15 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
         prepare.setPaperUrl(paperurl);
         prepare.setStructUrl(structurl);
 
+        ExamCacheBean exam=getExamCacheBean(es.getExamId());
+        Integer breakResumeCount=exam.getBreakResumeCount();
         // 更新考生缓存
         redisUtil.set(RedisKeyHelper.examStudentCacheKey(examStudentId), es);
         //更新场次-考试记录缓存
         ExamActivityRecordCacheUtil.setExamRecordStatus(activityId, recordId, ExamRecordCacheUtil.getStatus(recordId));
         teStudentCacheDto.setUnFinishedRecordId(recordId);
         redisUtil.setStudent(studentId, teStudentCacheDto);
+        ExamRecordCacheUtil.setLeftBreakResumeCount(recordId, breakResumeCount);
         return prepare;
     }