|
@@ -113,7 +113,7 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
|
|
|
}
|
|
|
|
|
|
List<String[]> lineList = ExcelReader.readSheetBySax(PathUtil.getCanonicalPath(file), 1,
|
|
|
- 14);
|
|
|
+ 16);
|
|
|
|
|
|
if (CollectionUtils.isEmpty(lineList)) {
|
|
|
importEntity.setStatus(ExamStudentImportStatus.ERROR);
|
|
@@ -169,8 +169,10 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
|
|
|
es.setPhone(trimAndNullIfBlank(line[11]));
|
|
|
es.setGrade(trimAndNullIfBlank(line[12]));
|
|
|
|
|
|
- String d1 = trimAndNullIfBlank(line[13]);
|
|
|
- String d2 = trimAndNullIfBlank(line[14]);
|
|
|
+ es.setExt1(trimAndNullIfBlank(line[13]));
|
|
|
+
|
|
|
+ String d1 = trimAndNullIfBlank(line[14]);
|
|
|
+ String d2 = trimAndNullIfBlank(line[15]);
|
|
|
|
|
|
if (!new Boolean(null == d1).equals(new Boolean(null == d2))) {
|
|
|
failRecords.add(buildFailRecord(es.getLineNum(), "考试时间不匹配"));
|
|
@@ -202,12 +204,6 @@ public class ExamStudentImportParsingFileTask extends AbstractTask {
|
|
|
es.setSpecialEndTime(specialEndTime);
|
|
|
}
|
|
|
|
|
|
- es.setExt1(trimAndNullIfBlank(line[15]));
|
|
|
- es.setExt2(trimAndNullIfBlank(line[16]));
|
|
|
- es.setExt3(trimAndNullIfBlank(line[17]));
|
|
|
- es.setExt4(trimAndNullIfBlank(line[18]));
|
|
|
- es.setExt5(trimAndNullIfBlank(line[19]));
|
|
|
-
|
|
|
if (hasError(failRecords, es)) {
|
|
|
continue;
|
|
|
}
|