...

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

@@ -180,6 +180,8 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 		String orgCode = entity.getOrgCode();
 
 		int error = 0;
+		Map<String, Object> map = Maps.newHashMap();
+		map.put("lineNum", entity.getLineNum());
 
 		try {
 			GetCourseReq req = new GetCourseReq();
@@ -190,25 +192,17 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			entity.setCourseId(courseBean.getId());
 
 			if (null != courseBean.getEnable() && (!courseBean.getEnable())) {
-				Map<String, Object> map = Maps.newHashMap();
-				map.put("lineNum", entity.getLineNum());
 				map.put("msg", "  " + "课程被禁用");
-				failRecords.add(map);
 				entity.setStatusCode("T-890101");
 				entity.setStatusDesc("课程被禁用");
-				examStudentTempRepo.saveAndFlush(entity);
 				error++;
 			}
 
 		} catch (StatusException e) {
 			debugLog.error("查询课程异常", e);
-			Map<String, Object> map = Maps.newHashMap();
-			map.put("lineNum", entity.getLineNum());
 			map.put("msg", "  " + e.getDesc());
-			failRecords.add(map);
 			entity.setStatusCode(e.getCode());
 			entity.setStatusDesc(e.getDesc());
-			examStudentTempRepo.saveAndFlush(entity);
 			error++;
 		}
 
@@ -221,39 +215,29 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 			entity.setOrgId(org.getId());
 
 			if (null != org.getEnable() && (!org.getEnable())) {
-				Map<String, Object> map = Maps.newHashMap();
-				map.put("lineNum", entity.getLineNum());
 				map.put("msg", "  " + "机构被禁用");
-				failRecords.add(map);
 				entity.setStatusCode("T-890100");
 				entity.setStatusDesc("机构被禁用");
-				examStudentTempRepo.saveAndFlush(entity);
 				error++;
 			}
 
 		} catch (StatusException e) {
 			debugLog.error("查询机构异常", e);
-			Map<String, Object> map = Maps.newHashMap();
-			map.put("lineNum", entity.getLineNum());
 			map.put("msg", "  " + e.getDesc());
-			failRecords.add(map);
 			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) {
+			failRecords.add(map);
+			examStudentTempRepo.saveAndFlush(entity);
 			return;
 		}
 
@@ -295,8 +279,6 @@ public class ExamStudentImportDataProcessingTask extends AbstractTask {
 
 		} catch (StatusException e) {
 			debugLog.error("考生入库异常", e);
-			Map<String, Object> map = Maps.newHashMap();
-			map.put("lineNum", entity.getLineNum());
 			map.put("msg", "  " + e.getDesc());
 			failRecords.add(map);
 			entity.setStatusCode(e.getCode());