...

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

@@ -179,6 +179,8 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 		String courseCode = entity.getCourseCode();
 		String orgCode = entity.getOrgCode();
 
+		int error = 0;
+
 		try {
 			GetCourseReq req = new GetCourseReq();
 			req.setRootOrgId(rootOrgId);
@@ -195,7 +197,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 				entity.setStatusCode("T-890101");
 				entity.setStatusDesc("课程被禁用");
 				examStudentTempRepo.saveAndFlush(entity);
-				return;
+				error++;
 			}
 
 		} catch (StatusException e) {
@@ -207,7 +209,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			entity.setStatusCode(e.getCode());
 			entity.setStatusDesc(e.getDesc());
 			examStudentTempRepo.saveAndFlush(entity);
-			return;
+			error++;
 		}
 
 		try {
@@ -226,7 +228,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 				entity.setStatusCode("T-890100");
 				entity.setStatusDesc("机构被禁用");
 				examStudentTempRepo.saveAndFlush(entity);
-				return;
+				error++;
 			}
 
 		} catch (StatusException e) {
@@ -238,6 +240,20 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			entity.setStatusCode(e.getCode());
 			entity.setStatusDesc(e.getDesc());
 			examStudentTempRepo.saveAndFlush(entity);
+			error++;
+		}
+
+		if (error == 2) {
+			Map<String, Object> map = Maps.newHashMap();
+			map.put("lineNum", entity.getLineNum());
+			map.put("msg", "  " + "机构和课程被禁用");
+			failRecords.add(map);
+			entity.setStatusCode("T-890105");
+			entity.setStatusDesc("机构和课程被禁用");
+			examStudentTempRepo.saveAndFlush(entity);
+		}
+
+		if (error > 0) {
 			return;
 		}