wangwei 7 tahun lalu
induk
melakukan
d73c04ce0f

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

@@ -183,6 +183,7 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			map.put("lineNum", entity.getLineNum());
 			map.put("msg", e.getDesc());
 			failRecords.add(map);
+			return;
 		}
 
 		try {
@@ -195,38 +196,53 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			map.put("lineNum", entity.getLineNum());
 			map.put("msg", e.getDesc());
 			failRecords.add(map);
+			return;
 		}
 
-		InsertOrUpdateStudentReq saveStudentReq = new InsertOrUpdateStudentReq();
-		saveStudentReq.setIdentityNumber(entity.getIdentityNumber());
-		saveStudentReq.setName(entity.getName());
-		saveStudentReq.setPhoneNumber(entity.getPhone());
-		saveStudentReq.setOrgCode(entity.getOrgCode());
-		saveStudentReq.setOrgId(entity.getOrgId());
-		saveStudentReq.setRootOrgId(rootOrgId);
-		saveStudentReq.setStudentCode(entity.getStudentCode());
-
-		InsertOrUpdateStudentResp insertOrUpdateStudentResp = studentCloudService
-				.insertOrUpdateStudent(saveStudentReq);
-
-		Long studentId = insertOrUpdateStudentResp.getStudentId();
-
-		SaveExamStudentReq sReq = new SaveExamStudentReq();
-		sReq.setCourseLevel(entity.getCourseLevel());
-
-		CourseLevel courseLevel = CourseLevel.getCourseLevel(entity.getCourseLevel());
-		sReq.setCourseLevel(courseLevel.name());
-		sReq.setCourseCode(entity.getCourseCode());
-		sReq.setCourseName(entity.getCourseName());
-		sReq.setExamId(entity.getExamId());
-		sReq.setStudentId(studentId);
-		sReq.setIdentityNumber(entity.getIdentityNumber());
-		sReq.setPaperType(entity.getPaperType());
-		sReq.setRootOrgId(rootOrgId);
-		sReq.setStudentCode(entity.getStudentCode());
-		sReq.setStudentName(entity.getName());
-		sReq.setPaperType("O");
-		examStudentCloudService.saveExamStudent(sReq);
+		try {
+			InsertOrUpdateStudentReq saveStudentReq = new InsertOrUpdateStudentReq();
+			saveStudentReq.setIdentityNumber(entity.getIdentityNumber());
+			saveStudentReq.setName(entity.getName());
+			saveStudentReq.setPhoneNumber(entity.getPhone());
+			saveStudentReq.setOrgCode(entity.getOrgCode());
+			saveStudentReq.setOrgId(entity.getOrgId());
+			saveStudentReq.setRootOrgId(rootOrgId);
+			saveStudentReq.setStudentCode(entity.getStudentCode());
+
+			InsertOrUpdateStudentResp insertOrUpdateStudentResp = studentCloudService
+					.insertOrUpdateStudent(saveStudentReq);
+
+			Long studentId = insertOrUpdateStudentResp.getStudentId();
+
+			SaveExamStudentReq sReq = new SaveExamStudentReq();
+			sReq.setCourseLevel(entity.getCourseLevel());
+
+			CourseLevel courseLevel = CourseLevel.getCourseLevel(entity.getCourseLevel());
+			sReq.setCourseLevel(courseLevel.name());
+			sReq.setCourseCode(entity.getCourseCode());
+			sReq.setCourseName(entity.getCourseName());
+			sReq.setExamId(entity.getExamId());
+			sReq.setStudentId(studentId);
+			sReq.setIdentityNumber(entity.getIdentityNumber());
+			sReq.setPaperType(entity.getPaperType());
+			sReq.setRootOrgId(rootOrgId);
+			sReq.setStudentCode(entity.getStudentCode());
+			sReq.setStudentName(entity.getName());
+			sReq.setPaperType("O");
+			examStudentCloudService.saveExamStudent(sReq);
+		} catch (StatusException e) {
+			Map<String, Object> map = Maps.newHashMap();
+			map.put("lineNum", entity.getLineNum());
+			map.put("msg", "  " + e.getDesc());
+			failRecords.add(map);
+			return;
+		} catch (Exception e) {
+			Map<String, Object> map = Maps.newHashMap();
+			map.put("lineNum", entity.getLineNum());
+			map.put("msg", "  " + e.getMessage());
+			failRecords.add(map);
+			return;
+		}
 
 	}