wangwei 7 年之前
父节点
当前提交
5db6cb1ed9

+ 7 - 2
examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportDataProcessingTask.java

@@ -87,8 +87,13 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 	public void run(ScheduleJob scheduleJob) throws Exception {
 
 		ExamStudentImportEntity importEntity = examStudentImportRepo
-				.findFirstByStatusOrderByCreationTime(
-						ExamStudentImportStatus.FILE_PARSING_COMPLETE);
+				.findFirstByStatusOrderByCreationTime(ExamStudentImportStatus.DATA_PROCESSING);
+
+		if (null == importEntity) {
+			importEntity = examStudentImportRepo.findFirstByStatusOrderByCreationTime(
+					ExamStudentImportStatus.FILE_PARSING_COMPLETE);
+		}
+
 		if (null == importEntity) {
 			return;
 		}

+ 7 - 1
examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamStudentImportParsingFileTask.java

@@ -61,7 +61,13 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 	public void run(ScheduleJob scheduleJob) throws Exception {
 
 		ExamStudentImportEntity importEntity = examStudentImportRepo
-				.findFirstByStatusOrderByCreationTime(ExamStudentImportStatus.NONE);
+				.findFirstByStatusOrderByCreationTime(ExamStudentImportStatus.FILE_PARSING);
+
+		if (null == importEntity) {
+			importEntity = examStudentImportRepo
+					.findFirstByStatusOrderByCreationTime(ExamStudentImportStatus.NONE);
+		}
+
 		if (null == importEntity) {
 			return;
 		}