修改重考和导出的bug

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamRecordDataServiceImpl.java

@@ -100,7 +100,7 @@ public class ExamRecordDataServiceImpl implements ExamRecordDataService {
         Long canExamTimes = examBean.getExamTimes() == null ? 0 : examBean.getExamTimes();
         Boolean isReExamine =examStudent.getIsReExamine()==null?false:examStudent.getIsReExamine();
         //如果是重考，则考试次数加1
-        if (examTimes >= canExamTimes && isReExamine) {
+        if (isReExamine && examTimes >= canExamTimes) {
             examTimes = canExamTimes.intValue() + 1;
         }
         examRecordData.setExamOrder(examTimes);

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamStudentServiceImpl.java

@@ -195,7 +195,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
             reExamineCompleted = null;
         }
         // 考生开始重考时，将重考已完成设置为true
-        if (CommonUtil.isTrue(examStudent.getIsReExamine())) {
+        if (CommonUtil.isTrue(isReExamine)) {
             reExamineCompleted = true;
         }
         Date now = new Date();
@@ -205,7 +205,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
         examStudent.setFinished(true);
         examStudent.setNormalExamTimes(normalExamTimes);
         examStudent.setIsReExamine(isReExamine);
-        examStudent.setReExamineCompleted(isReExamine);
+        examStudent.setReExamineCompleted(reExamineCompleted);
         examStudent.setUpdateTime(now);
         return examStudent;
     }