Merge branch 'dev'

1

themis-backend/src/main/java/com/qmth/themis/backend/api/TEExamReexamController.java

@@ -131,6 +131,10 @@ public class TEExamReexamController {
                         Integer alreadyExamCount = Objects.nonNull(examStudentCacheBean.getAlreadyExamCount()) ? examStudentCacheBean.getAlreadyExamCount() : 0;
                         if (alreadyExamCount > 0) {
                             alreadyExamCount = alreadyExamCount - 1;
+                            ExamCacheBean ec = teExamService.getExamCacheBean(examStudentCacheBean.getExamId());//考试缓存
+                            if (alreadyExamCount.intValue() >= ec.getExamCount().intValue()) {
+                                alreadyExamCount = 0;
+                            }
                             UpdateWrapper<TEExamStudent> teExamStudentUpdateWrapper = new UpdateWrapper<>();
                             teExamStudentUpdateWrapper.lambda().set(TEExamStudent::getAlreadyExamCount, alreadyExamCount)
                                     .eq(TEExamStudent::getId, s);