add:评卷参数分组基础对象调整

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperGroup.java

@@ -19,21 +19,12 @@ import java.io.Serializable;
 public class ExamPaperGroup extends BaseEntity implements Serializable {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "考试id")
+    @ApiModelProperty(value = "试卷结构id")
     @JsonSerialize(using = ToStringSerializer.class)
-    private Long examId;
-
-    @ApiModelProperty(value = "课程编号'")
-    private String courseCode;
-
-    @ApiModelProperty(value = "课程名称")
-    private String courseName;
-
-    @ApiModelProperty(value = "试卷编号")
-    private String paperNumber;
+    private Long examPaperStructureId;
 
     @ApiModelProperty(value = "分组序号")
-    private String groupNumber;
+    private Integer groupNumber;
 
     @ApiModelProperty(value = "双评比例（0关闭，1开启）")
     private Integer doubleRate;
@@ -53,43 +44,19 @@ public class ExamPaperGroup extends BaseEntity implements Serializable {
     @ApiModelProperty(value = "题目信息")
     private String questionInfo;
 
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
+    public Long getExamPaperStructureId() {
+        return examPaperStructureId;
     }
 
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
+    public void setExamPaperStructureId(Long examPaperStructureId) {
+        this.examPaperStructureId = examPaperStructureId;
     }
 
-    public String getGroupNumber() {
+    public Integer getGroupNumber() {
         return groupNumber;
     }
 
-    public void setGroupNumber(String groupNumber) {
+    public void setGroupNumber(Integer groupNumber) {
         this.groupNumber = groupNumber;
     }
 

distributed-print-business/src/main/java/com/qmth/distributed/print/business/entity/ExamPaperStructure.java

@@ -41,6 +41,11 @@ public class ExamPaperStructure extends BaseEntity implements Serializable {
     @TableField("semester_name")
     private String semesterName;
 
+    @ApiModelProperty(value = "考试id")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField("exam_id")
+    private Long examId;
+
     @ApiModelProperty(value = "云阅卷考试ID")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "third_relate_id")
@@ -92,6 +97,10 @@ public class ExamPaperStructure extends BaseEntity implements Serializable {
      */
     @TableField("subjective_structure")
     private String subjectiveStructure;
+
+    @ApiModelProperty(value = "试卷整体json")
+    @TableField("paper_info_json")
+    private String paperInfoJson;
     /**
      * 命题老师ID
      */
@@ -234,4 +243,20 @@ public class ExamPaperStructure extends BaseEntity implements Serializable {
     public void setPaperNumberId(String paperNumberId) {
         this.paperNumberId = paperNumberId;
     }
+
+    public Long getExamId() {
+        return examId;
+    }
+
+    public void setExamId(Long examId) {
+        this.examId = examId;
+    }
+
+    public String getPaperInfoJson() {
+        return paperInfoJson;
+    }
+
+    public void setPaperInfoJson(String paperInfoJson) {
+        this.paperInfoJson = paperInfoJson;
+    }
 }