...

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

@@ -50,7 +50,8 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 	private static final String EXAM_STUDENT_IMPORT_FILES = "exam_student_import_files";
 
 	private static final String[] EXCEL_HEADER = new String[]{"姓名", "学号", "身份证号", "学习中心代码",
-			"学习中心名称", "课程代码", "课程名称", "试卷类型", "专业", "考点", "信息采集人", "学生电话", "年级", "试卷袋编码"};
+			"学习中心名称", "课程代码", "课程名称", "试卷类型", "专业", "考点", "信息采集人", "学生电话", "年级", "试卷袋编码", "考试开始时间",
+			"考试结束时间"};
 
 	@Autowired
 	TaskTracker taskTracker;
@@ -172,7 +173,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 			String d2 = trimAndNullIfBlank(line[14]);
 
 			if (!new Boolean(null == d1).equals(new Boolean(null == d2))) {
-				failRecords.add(buildFailRecord(es.getLineNum(), "特殊考试时间不匹配"));
+				failRecords.add(buildFailRecord(es.getLineNum(), "考试时间不匹配"));
 				continue;
 			}
 
@@ -183,18 +184,18 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
 				try {
 					specialBeginTime = DateUtil.parseRandomly(d1);
 				} catch (Exception e) {
-					failRecords.add(buildFailRecord(es.getLineNum(), "特殊考试开始时间格式错误"));
+					failRecords.add(buildFailRecord(es.getLineNum(), "考试开始时间格式错误"));
 					continue;
 				}
 				try {
 					specialEndTime = DateUtil.parseRandomly(d2);
 				} catch (Exception e) {
-					failRecords.add(buildFailRecord(es.getLineNum(), "特殊考试结束时间格式错误"));
+					failRecords.add(buildFailRecord(es.getLineNum(), "考试结束时间格式错误"));
 					continue;
 				}
 
 				if (specialBeginTime.after(specialEndTime)) {
-					failRecords.add(buildFailRecord(es.getLineNum(), "开始时间不能大于结束时间"));
+					failRecords.add(buildFailRecord(es.getLineNum(), "考试开始时间不能大于考试结束时间"));
 					continue;
 				}
 				es.setSpecialBeginTime(specialBeginTime);