xiatian 2 жил өмнө
parent
commit
2c8840b611

+ 0 - 9
src/main/java/cn/com/qmth/scancloud/tools/model/Struct.java

@@ -8,7 +8,6 @@ public class Struct {
     private Integer mainNumber;
     private String subNumber;
     private String mainTitle;
-    private Double totalScore;
     public String getSubjectCode() {
         return subjectCode;
     }
@@ -57,14 +56,6 @@ public class Struct {
         this.mainTitle = mainTitle;
     }
 
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
     
     public Long getExamId() {
         return examId;

+ 1 - 22
src/main/java/cn/com/qmth/scancloud/tools/service/impl/StructImportTask.java

@@ -35,7 +35,7 @@ public class StructImportTask extends AbstractTask {
 
     private static final Logger log = LoggerFactory.getLogger(StructImportTask.class);
 
-    private static final String[] EXCEL_HEADER = new String[] { "科目代码","是否客观题", "大题名称", "大题号", "小题号", "小题满分" };
+    private static final String[] EXCEL_HEADER = new String[] { "科目代码","是否客观题", "大题名称", "大题号", "小题号"};
 
     @Override
     protected String getTaskName() {
@@ -165,27 +165,6 @@ public class StructImportTask extends AbstractTask {
 
                 }
 
-                String score = trimAndNullIfBlank(line.getValue(5));
-                if (StringUtils.isBlank(score)) {
-                    msg.append("  小题满分不能为空");
-                } else {
-                    try {
-                        Double n = Double.valueOf(score);
-                        if (n <= 0) {
-                            msg.append("  小题满分不能小于0");
-                        } else {
-                            if (score.indexOf(".") >= 0 && score.indexOf(".") < score.length() - 2) {
-                                msg.append("小题满分只能有一位小数");
-                            } else {
-                                imp.setTotalScore(n);
-                            }
-                        }
-                    } catch (Exception e) {
-                        msg.append("  小题满分格式错误");
-                    }
-
-                }
-
                 if (msg.length() > 0) {
                     failRecords.add(newError(i + 1, msg.toString()));
                 } else {

BIN
template/struct-import.xlsx