3.3.0 卡格式结构解析

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/vo/parseCard/Struct.java

@@ -7,6 +7,7 @@ public class Struct {
     private int subNumber;
     private String mainTitle;
     private int type;
+    private Boolean isObjective;
     private String typeName;
     private int optionCount;
     private int paperIndex;
@@ -52,6 +53,14 @@ public class Struct {
         this.type = type;
     }
 
+    public Boolean getObjective() {
+        return isObjective;
+    }
+
+    public void setObjective(Boolean objective) {
+        isObjective = objective;
+    }
+
     public String getTypeName() {
         return typeName;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/vo/parseCard/StructData.java

@@ -10,6 +10,7 @@ public class StructData {
     private int optionCount;
     private int type;
     private String typeName;
+    private Boolean isObjective;
     private String qType;
     private int paperIndex;
     private int pageIndex;
@@ -21,6 +22,7 @@ public class StructData {
         this.type = type;
         this.typeName = typeName;
         this.qType = qType;
+        this.isObjective = "objective".equals(qType);
     }
 
     public int getMainNumber() {
@@ -87,6 +89,14 @@ public class StructData {
         this.typeName = typeName;
     }
 
+    public Boolean getObjective() {
+        return isObjective;
+    }
+
+    public void setObjective(Boolean objective) {
+        isObjective = objective;
+    }
+
     public String getqType() {
         return qType;
     }

distributed-print-business/src/main/java/com/qmth/distributed/print/business/util/CardParseUtils.java

@@ -78,6 +78,7 @@ public class CardParseUtils {
                 struct.setSubNumber(startNumber + i);
                 struct.setMainTitle(structData.getMainTitle());
                 struct.setType(structData.getType());
+                struct.setObjective(structData.getObjective());
                 struct.setTypeName(structData.getTypeName());
                 struct.setOptionCount(structData.getOptionCount());
                 struct.setPaperIndex(structData.getPaperIndex());

teachcloud-mark/src/main/java/com/qmth/teachcloud/mark/entity/MarkQuestion.java

@@ -55,6 +55,8 @@ public class MarkQuestion implements Serializable {
 
     @ApiModelProperty(value = "正确答案")
     private String answer;
+    @ApiModelProperty(value = "客观题答案数量")
+    private String optionCount;
 
     @ApiModelProperty(value = "满分")
     private Double totalScore;
@@ -137,6 +139,15 @@ public class MarkQuestion implements Serializable {
     public void setAnswer(String answer) {
         this.answer = answer;
     }
+
+    public String getOptionCount() {
+        return optionCount;
+    }
+
+    public void setOptionCount(String optionCount) {
+        this.optionCount = optionCount;
+    }
+
     public Double getTotalScore() {
         return totalScore;
     }