脚本和枚举类型修改

themis-business/src/main/java/com/qmth/themis/business/enums/FinishExamTypeEnum.java

@@ -1,33 +0,0 @@
-package com.qmth.themis.business.enums;
-
-/**
- * @Description: 结束考试 enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2020/7/27
- */
-public enum FinishExamTypeEnum {
-	/**
-	 * 手动
-	 */
-	MANUAL("手动"),
-	/**
-	 * 自动
-	 */
-	AUTO("自动"),
-	/**
-	 * 监考强制
-	 */
-	INTERRUPT("监考强制");
-
-	private String title;
-
-	private FinishExamTypeEnum(String title) {
-		this.title = title;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-}

themis-business/src/main/java/com/qmth/themis/business/enums/FinishTypeEnum.java

@@ -8,12 +8,14 @@ package com.qmth.themis.business.enums;
 * @Date: 2020/7/29
 */
 public enum FinishTypeEnum {
-    //todo 数据模型待补充确认
-    hand("手动交卷"),
 
-    auto("系统交卷"),
+    hand("手动"),
 
-    breach("违纪交卷");
+    auto("自动"),
+
+    breach("违纪交卷"),
+
+    INTERRUPT("监考强制");
 
     private String code;
 

themis-task/src/main/java/com/qmth/themis/task/quartz/ExamActivityJob.java

@@ -5,7 +5,7 @@ import com.qmth.themis.business.entity.TEExamActivity;
 import com.qmth.themis.business.entity.TEExamStudent;
 import com.qmth.themis.business.entity.TOeExamRecord;
 import com.qmth.themis.business.enums.ExamRecordStatusEnum;
-import com.qmth.themis.business.enums.FinishExamTypeEnum;
+import com.qmth.themis.business.enums.FinishTypeEnum;
 import com.qmth.themis.business.service.TEExamActivityService;
 import com.qmth.themis.business.service.TEExamStudentService;
 import com.qmth.themis.business.service.TOeExamRecordService;
@@ -62,9 +62,9 @@ public class ExamActivityJob extends QuartzJobBean {
                 List<TOeExamRecord> tOeExamRecordList = tOeExamRecordService.list(tOeExamRecordQueryWrapper);
                 List<Long> examStudentIdList = new ArrayList<>();
                 tOeExamRecordList.forEach(s -> {
-                    s.setStatus(ExamRecordStatusEnum.finished.ordinal());
+                    s.setStatus(ExamRecordStatusEnum.finished);
                     s.setFinishTime(new Date());
-                    s.setFinishType(FinishExamTypeEnum.INTERRUPT.ordinal());
+                    s.setFinishType(FinishTypeEnum.INTERRUPT);
                     examStudentIdList.add(s.getExamStudentId());
                 });
                 tOeExamRecordService.updateBatchById(tOeExamRecordList);