xiatian 2 anni fa
parent
commit
bccb6f39a8

+ 4 - 3
src/main/java/cn/com/qmth/scancloud/tools/service/impl/ObjectiveQuestionExportTask.java

@@ -208,21 +208,22 @@ public class ObjectiveQuestionExportTask extends AbstractTask {
                 CetMarking imp = new CetMarking();
                 String paperType = trimAndNullIfBlank(line.getValue(3));
                 if (StringUtils.isBlank(paperType)) {
-                    throw new StatusException(newError(i + 1, "条形码值不能为空"));
+                    throw new StatusException(newError(i + 2, "条形码值不能为空"));
                 }
                 imp.setPaperType(paperType);
 
                 String oddNumber = trimAndNullIfBlank(line.getValue(5));
                 if (StringUtils.isBlank(oddNumber)) {
-                    throw new StatusException(newError(i + 1, "奇数考场评卷点代码不能为空"));
+                    throw new StatusException(newError(i + 2, "奇数考场评卷点代码不能为空"));
                 }
                 imp.setOddNumber(oddNumber);
 
                 String evenNumber = trimAndNullIfBlank(line.getValue(7));
                 if (StringUtils.isBlank(evenNumber)) {
-                    throw new StatusException(newError(i + 1, "偶数考场评卷点代码不能为空"));
+                    throw new StatusException(newError(i + 2, "偶数考场评卷点代码不能为空"));
                 }
                 imp.setEvenNumber(evenNumber);
+                list.add(imp);
 
             }
             if (list.size() == 0) {

+ 2 - 3
src/main/java/cn/com/qmth/scancloud/tools/service/impl/StructImportTask.java

@@ -166,7 +166,7 @@ public class StructImportTask extends AbstractTask {
                 }
 
                 if (msg.length() > 0) {
-                    failRecords.add(newError(i + 1, msg.toString()));
+                    failRecords.add(newError(i + 2, msg.toString()));
                 } else {
                     ret.add(imp);
                 }
@@ -174,9 +174,8 @@ public class StructImportTask extends AbstractTask {
             }
             if (CollectionUtils.isNotEmpty(failRecords)) {
                 for (String err : failRecords) {
-                    log.error(err);
+                    throw new StatusException(err);
                 }
-                throw new StatusException("请检查填写信息");
             }
             return ret;
         } catch (Exception e) {

BIN
template/marking-place.xlsx