xiatian 2 anos atrás
pai
commit
e28e0e715e

+ 12 - 8
src/main/java/cn/com/qmth/scancloud/tools/service/impl/ObjectiveQuestionExportTask.java

@@ -124,15 +124,19 @@ public class ObjectiveQuestionExportTask extends AbstractTask {
             if (subjectCode >= 3 && subjectCode <= 9) {
                 markingCode = "88";
             } else {
-                int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
-                CetMarking cm=cms.get(data.getPaperType());
-                if(cm==null) {
-                  throw new StatusException("未找到考点数据,PaperType:"+data.getPaperType()); 
-                }
-                if (site % 2 == 0) {
-                    markingCode = cm.getEvenNumber();
+                if ("000000".equals(data.getPaperType()) || "999999".equals(data.getPaperType())) {
+                    markingCode = "00";
                 } else {
-                    markingCode = cm.getOddNumber();
+                    int site = Integer.valueOf(data.getExamNumber().substring(10, 13));
+                    CetMarking cm = cms.get(data.getPaperType());
+                    if (cm == null) {
+                        throw new StatusException("未找到考点数据,PaperType:" + data.getPaperType());
+                    }
+                    if (site % 2 == 0) {
+                        markingCode = cm.getEvenNumber();
+                    } else {
+                        markingCode = cm.getOddNumber();
+                    }
                 }
             }
             line.add(markingCode);