|
@@ -117,14 +117,15 @@ public class ObjectiveQuestionExportTask extends AbstractTask {
|
|
|
line.add(data.getAnswer());
|
|
|
line.add(data.getCardFirst() + "");
|
|
|
line.add(data.getCardSecond() + "");
|
|
|
- line.add(data.getBreachCode());
|
|
|
+ line.add(StringUtils.isBlank(data.getBreachCode()) ? "0" : data.getBreachCode());
|
|
|
line.add(data.getPaperType());
|
|
|
int subjectCode = Integer.valueOf(data.getExamNumber().substring(9, 10));
|
|
|
String markingCode;
|
|
|
if (subjectCode >= 3 && subjectCode <= 9) {
|
|
|
markingCode = "88";
|
|
|
} else {
|
|
|
- if ("000000".equals(data.getPaperType()) || "999999".equals(data.getPaperType())) {
|
|
|
+ if (ExamStatus.ABSENT.equals(data.getExamStatus()) || "000000".equals(data.getPaperType())
|
|
|
+ || "999999".equals(data.getPaperType())) {
|
|
|
markingCode = "00";
|
|
|
} else {
|
|
|
int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
|