印刷平台数据库表名、字段名调整。

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/CoursePaper.java

@@ -7,18 +7,19 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 课程试卷关联表
+ * 课程试卷关联信息
  */
 @Entity
 @Table(name = "ec_prt_course_paper", indexes = {
-        @Index(name = "IDX_PRT_COURSE_PAPER_001001", columnList = "orgId"),
-        @Index(name = "IDX_PRT_COURSE_PAPER_001002", columnList = "examId"),
-        @Index(name = "IDX_PRT_COURSE_PAPER_001003", columnList = "courseCode")})
+        @Index(name = "INDEX_PRT_COURSE_PAPER_01", columnList = "orgId"),
+        @Index(name = "INDEX_PRT_COURSE_PAPER_02", columnList = "examId"),
+        @Index(name = "INDEX_PRT_COURSE_PAPER_03", columnList = "courseCode")})
 public class CoursePaper extends IdEntity {
     /**
      * 机构ID
@@ -29,32 +30,38 @@ public class CoursePaper extends IdEntity {
      */
     private Long examId;
     /**
-     * 试卷id
+     * 试卷ID
      */
+    @Column(length = 50)
     private String paperId;
     /**
      * 课程code
      */
+    @Column(length = 50)
     private String courseCode;
     /**
      * 课程名称
      */
+    @Column(length = 50)
     private String courseName;
     /**
      * 试卷名称
      */
+    @Column(length = 50)
     private String paperName;
     /**
-     * 试卷P数
+     * 试卷P数(1P为1面，1张纸为2P)
      */
-    private Integer pNum;
+    private Integer paperP;
     /**
      * 试卷文件URL
      */
+    @Column(length = 200)
     private String paperFileUrl;
     /**
      * 答案文件URL
      */
+    @Column(length = 200)
     private String answerFileUrl;
 
     public Long getOrgId() {
@@ -105,12 +112,12 @@ public class CoursePaper extends IdEntity {
         this.paperName = paperName;
     }
 
-    public Integer getpNum() {
-        return pNum;
+    public Integer getPaperP() {
+        return paperP;
     }
 
-    public void setpNum(Integer pNum) {
-        this.pNum = pNum;
+    public void setPaperP(Integer paperP) {
+        this.paperP = paperP;
     }
 
     public String getPaperFileUrl() {

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/CourseStatistics.java → examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/CourseStatistic.java

@@ -7,19 +7,20 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 课程统计
+ * 课程统计信息
  */
 @Entity
-@Table(name = "ec_prt_course_statistics", indexes = {
-        @Index(name = "IDX_PRT_COURSE_STATISTICS_001001", columnList = "orgId"),
-        @Index(name = "IDX_PRT_COURSE_STATISTICS_001002", columnList = "examId"),
-        @Index(name = "IDX_PRT_COURSE_STATISTICS_001003", columnList = "coursePaperId")})
-public class CourseStatistics extends IdEntity {
+@Table(name = "ec_prt_course_statistic", indexes = {
+        @Index(name = "INDEX_PRT_COURSE_STATISTIC_01", columnList = "orgId"),
+        @Index(name = "INDEX_PRT_COURSE_STATISTIC_02", columnList = "examId"),
+        @Index(name = "INDEX_PRT_COURSE_STATISTIC_03", columnList = "coursePaperId")})
+public class CourseStatistic extends IdEntity {
     /**
      * 机构ID
      */
@@ -29,20 +30,23 @@ public class CourseStatistics extends IdEntity {
      */
     private Long examId;
     /**
-     * 绑定试卷ID :printing_course_paper 的ID
+     * 绑定试卷ID(表ec_prt_course_paper的ID)
      */
     private Long coursePaperId;
     /**
      * 课程code
      */
+    @Column(length = 50)
     private String courseCode;
     /**
      * 课程名称
      */
+    @Column(length = 50)
     private String courseName;
     /**
      * 试卷类型
      */
+    @Column(length = 50)
     private String paperType;
 
     public Long getOrgId() {

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/ExamStructure.java

@@ -7,14 +7,19 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 导出结构设置
+ * 导出结构设置信息
  */
 @Entity
-@Table(name = "ec_prt_exam_structure")
+@Table(name = "ec_prt_exam_structure", indexes = {
+        @Index(name = "INDEX_PRT_EXAM_STRUCTURE_01", columnList = "orgId"),
+        @Index(name = "INDEX_PRT_EXAM_STRUCTURE_02", columnList = "examId"),
+        @Index(name = "INDEX_PRT_EXAM_STRUCTURE_03", columnList = "schoolId")})
 public class ExamStructure extends IdEntity {
     /**
      * 考试ID
@@ -25,25 +30,30 @@ public class ExamStructure extends IdEntity {
      */
     private Long orgId;
     /**
-     * 学校id (对应机构表 ecs_core_org)
+     * 学校ID(表ecs_core_org的ID)
      */
     private Long schoolId;
     /**
      * 学校名称
      */
+    @Column(length = 50)
     private String schoolName;
     /**
      * 机构名
      */
+    @Column(length = 50)
     private String orgName;
     /**
      * 考试名称
      */
+    @Column(length = 50)
     private String examName;
     /**
-     * 考试类型
-     * See ExamType.java
+     * 考试类型(如：ONLINE，TRADITION)
+     *
+     * @See ExamType.java
      */
+    @Column(length = 50)
     private String examType;
 
     public Long getExamId() {

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/ObjectiveQuestionStructure.java

@@ -7,69 +7,80 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 客观题数据--用于Excel导出
+ * 客观题信息(用于Excel导出)
  */
 @Entity
-@Table(name = "ec_prt_objective_question_structure")
+@Table(name = "ec_prt_objective_question_structure", indexes = {
+        @Index(name = "INDEX_PRT_OBJECTIVE_QUESTION_01", columnList = "examId")})
 public class ObjectiveQuestionStructure extends IdEntity {
     /**
      * 考试ID
      */
     private Long examId;
     /**
-     * 试卷id
+     * 试卷ID
      */
+    @Column(length = 50)
     private String paperId;
     /**
      * 课程代码
      */
     //@ExcelProperty(name = "课程代码", index = 0)
-    private String courseNo;
+    @Column(length = 50)
+    private String courseCode;
     /**
      * 课程名称
      */
     //@ExcelProperty(name = "课程名称", index = 1)
+    @Column(length = 50)
     private String courseName;
     /**
      * 试卷名称
      */
     //@ExcelProperty(name = "试卷名称", index = 2)
+    @Column(length = 50)
     private String paperName;
     /**
-     * 试卷类型
+     * 试卷类型(如：A、B)
      */
     //@ExcelProperty(name = "试卷类型", index = 3)
+    @Column(length = 50)
     private String paperType;
-    /**
-     * 大题号
-     */
-    //@ExcelProperty(name = "大题号", index = 4)
-    private Integer bigQuestionNo;
-    /**
-     * 小题号
-     */
-    //@ExcelProperty(name = "小题号", index = 5)
-    private Integer smallQuestionNo;
     /**
      * 题目类型
-     * See QuesStructType.java
+     *
+     * @See QuesStructType.java
      */
     //@ExcelProperty(name = "题目类型", index = 6)
+    @Column(length = 50)
     private String questionType;
     /**
      * 标准答案
      */
     //@ExcelProperty(name = "标准答案", index = 7)
+    @Column(length = 50)
     private String answer;
+    /**
+     * 大题号
+     */
+    //@ExcelProperty(name = "大题号", index = 4)
+    private Integer sectionNum;
+    /**
+     * 小题号
+     */
+    //@ExcelProperty(name = "小题号", index = 5)
+    private Integer unitNum;
     /**
      * 小题分数
      */
     //@ExcelProperty(name = "小题分数", index = 8)
-    private Double smallQuestionScore;
+    private Double unitScore;
 
     public Long getExamId() {
         return examId;
@@ -87,12 +98,12 @@ public class ObjectiveQuestionStructure extends IdEntity {
         this.paperId = paperId;
     }
 
-    public String getCourseNo() {
-        return courseNo;
+    public String getCourseCode() {
+        return courseCode;
     }
 
-    public void setCourseNo(String courseNo) {
-        this.courseNo = courseNo;
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
     }
 
     public String getCourseName() {
@@ -119,22 +130,6 @@ public class ObjectiveQuestionStructure extends IdEntity {
         this.paperType = paperType;
     }
 
-    public Integer getBigQuestionNo() {
-        return bigQuestionNo;
-    }
-
-    public void setBigQuestionNo(Integer bigQuestionNo) {
-        this.bigQuestionNo = bigQuestionNo;
-    }
-
-    public Integer getSmallQuestionNo() {
-        return smallQuestionNo;
-    }
-
-    public void setSmallQuestionNo(Integer smallQuestionNo) {
-        this.smallQuestionNo = smallQuestionNo;
-    }
-
     public String getQuestionType() {
         return questionType;
     }
@@ -151,12 +146,28 @@ public class ObjectiveQuestionStructure extends IdEntity {
         this.answer = answer;
     }
 
-    public Double getSmallQuestionScore() {
-        return smallQuestionScore;
+    public Integer getSectionNum() {
+        return sectionNum;
+    }
+
+    public void setSectionNum(Integer sectionNum) {
+        this.sectionNum = sectionNum;
+    }
+
+    public Integer getUnitNum() {
+        return unitNum;
+    }
+
+    public void setUnitNum(Integer unitNum) {
+        this.unitNum = unitNum;
+    }
+
+    public Double getUnitScore() {
+        return unitScore;
     }
 
-    public void setSmallQuestionScore(Double smallQuestionScore) {
-        this.smallQuestionScore = smallQuestionScore;
+    public void setUnitScore(Double unitScore) {
+        this.unitScore = unitScore;
     }
 
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/PrintingProject.java

@@ -7,15 +7,19 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 import java.util.Date;
 
 /**
- * 印刷项目实体类
+ * 印刷项目信息
  */
 @Entity
-@Table(name = "ec_prt_project")
+@Table(name = "ec_prt_project", indexes = {
+        @Index(name = "INDEX_PRT_PROJECT_01", columnList = "orgId"),
+        @Index(name = "INDEX_PRT_PROJECT_02", columnList = "examId")})
 public class PrintingProject extends IdEntity {
     /**
      * 机构ID
@@ -28,26 +32,30 @@ public class PrintingProject extends IdEntity {
     /**
      * 考试名称
      */
+    @Column(length = 50)
     private String examName;
     /**
      * 机构名称
      */
+    @Column(length = 50)
     private String orgName;
     /**
-     * 供应商ID (对应机构表 ecs_core_org)
+     * 供应商ID(表ecs_core_org的ID)
      */
     private Long supplierId;
     /**
      * 供应商名称
      */
+    @Column(length = 50)
     private String supplierName;
     /**
-     * 项目经理ID (对应用户表 ecs_core_user)
+     * 项目经理ID(表ecs_core_user的ID)
      */
     private Long pmId;
     /**
      * 项目经理名称
      */
+    @Column(length = 50)
     private String pmName;
     /**
      * 印刷数据准备开始时间
@@ -75,10 +83,8 @@ public class PrintingProject extends IdEntity {
     private Date mailEndTime;
     /**
      * 项目是否已完成
-     * 1:完成
-     * 0/null:未完成
      */
-    private Integer completed;
+    private Boolean completed;
 
     public Long getOrgId() {
         return orgId;
@@ -192,11 +198,11 @@ public class PrintingProject extends IdEntity {
         this.mailEndTime = mailEndTime;
     }
 
-    public Integer getCompleted() {
+    public Boolean getCompleted() {
         return completed;
     }
 
-    public void setCompleted(Integer completed) {
+    public void setCompleted(Boolean completed) {
         this.completed = completed;
     }
 

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/PrintingTemplate.java

@@ -9,16 +9,15 @@ package cn.com.qmth.examcloud.core.print.entity;
 
 import cn.com.qmth.examcloud.core.print.enums.TemplateType;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
- * 印刷模板
+ * 印刷模板信息
  */
 @Entity
-@Table(name = "ec_prt_template")
+@Table(name = "ec_prt_template", indexes = {
+        @Index(name = "INDEX_PRT_TEMPLATE_01", columnList = "orgId"),
+        @Index(name = "INDEX_PRT_TEMPLATE_02", columnList = "examId")})
 public class PrintingTemplate extends IdEntity {
     /**
      * 机构ID
@@ -31,27 +30,33 @@ public class PrintingTemplate extends IdEntity {
     /**
      * 机构名称
      */
+    @Column(length = 50)
     private String orgName;
-
     /**
      * 考试名称
      */
+    @Column(length = 50)
     private String examName;
     /**
      * 模板类型
      */
     @Enumerated(EnumType.STRING)
+    @Column(length = 50)
     private TemplateType templateType;
-    /**
-     * 序号
-     */
-    private Integer orderNum;
     /**
      * 文件地址
      */
+    @Column(length = 200)
     private String templateUrl;
-
+    /**
+     * 文件名
+     */
+    @Column(length = 50)
     private String fileName;
+    /**
+     * 序号
+     */
+    private Integer orderNum;
 
     public Long getOrgId() {
         return orgId;
@@ -93,14 +98,6 @@ public class PrintingTemplate extends IdEntity {
         this.templateType = templateType;
     }
 
-    public Integer getOrderNum() {
-        return orderNum;
-    }
-
-    public void setOrderNum(Integer orderNum) {
-        this.orderNum = orderNum;
-    }
-
     public String getTemplateUrl() {
         return templateUrl;
     }
@@ -117,4 +114,11 @@ public class PrintingTemplate extends IdEntity {
         this.fileName = fileName;
     }
 
+    public Integer getOrderNum() {
+        return orderNum;
+    }
+
+    public void setOrderNum(Integer orderNum) {
+        this.orderNum = orderNum;
+    }
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/ProjectBackupSetting.java

@@ -9,16 +9,14 @@ package cn.com.qmth.examcloud.core.print.entity;
 
 import cn.com.qmth.examcloud.core.print.enums.BackupGroupType;
 
-import javax.persistence.Entity;
-import javax.persistence.EnumType;
-import javax.persistence.Enumerated;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
- * 印刷项目备份设置
+ * 印刷项目-备份设置信息
  */
 @Entity
-@Table(name = "ec_prt_project_backup_setting")
+@Table(name = "ec_prt_project_backup_setting", indexes = {
+        @Index(name = "INDEX_PRT_PROJECT_BACKUP_01", columnList = "projectId")})
 public class ProjectBackupSetting extends IdEntity {
     /**
      * 项目ID
@@ -29,15 +27,15 @@ public class ProjectBackupSetting extends IdEntity {
     /**
      * 每袋备份比例
      */
-    private Double perPackageRatio;
+    private Double pkgPercent;
     /**
      * 每袋备份最大值
      */
-    private Double perPackageMax;
+    private Double pkgMax;
     /**
      * 每袋备份最小值
      */
-    private Double perPackageMin;
+    private Double pkgMin;
 
     /* 单独备份袋 */
     /**
@@ -48,15 +46,15 @@ public class ProjectBackupSetting extends IdEntity {
     /**
      * 单独备份比例
      */
-    private Double independentRatio;
+    private Double pkgSinglePercent;
     /**
      * 单独备份最大值
      */
-    private Double independentMax;
+    private Double pkgSingleMax;
     /**
      * 单独备份最小值
      */
-    private Double independentMin;
+    private Double pkgSingleMin;
 
     public Long getProjectId() {
         return projectId;
@@ -66,28 +64,28 @@ public class ProjectBackupSetting extends IdEntity {
         this.projectId = projectId;
     }
 
-    public Double getPerPackageRatio() {
-        return perPackageRatio;
+    public Double getPkgPercent() {
+        return pkgPercent;
     }
 
-    public void setPerPackageRatio(Double perPackageRatio) {
-        this.perPackageRatio = perPackageRatio;
+    public void setPkgPercent(Double pkgPercent) {
+        this.pkgPercent = pkgPercent;
     }
 
-    public Double getPerPackageMax() {
-        return perPackageMax;
+    public Double getPkgMax() {
+        return pkgMax;
     }
 
-    public void setPerPackageMax(Double perPackageMax) {
-        this.perPackageMax = perPackageMax;
+    public void setPkgMax(Double pkgMax) {
+        this.pkgMax = pkgMax;
     }
 
-    public Double getPerPackageMin() {
-        return perPackageMin;
+    public Double getPkgMin() {
+        return pkgMin;
     }
 
-    public void setPerPackageMin(Double perPackageMin) {
-        this.perPackageMin = perPackageMin;
+    public void setPkgMin(Double pkgMin) {
+        this.pkgMin = pkgMin;
     }
 
     public BackupGroupType getGroupType() {
@@ -98,28 +96,28 @@ public class ProjectBackupSetting extends IdEntity {
         this.groupType = groupType;
     }
 
-    public Double getIndependentRatio() {
-        return independentRatio;
+    public Double getPkgSinglePercent() {
+        return pkgSinglePercent;
     }
 
-    public void setIndependentRatio(Double independentRatio) {
-        this.independentRatio = independentRatio;
+    public void setPkgSinglePercent(Double pkgSinglePercent) {
+        this.pkgSinglePercent = pkgSinglePercent;
     }
 
-    public Double getIndependentMax() {
-        return independentMax;
+    public Double getPkgSingleMax() {
+        return pkgSingleMax;
     }
 
-    public void setIndependentMax(Double independentMax) {
-        this.independentMax = independentMax;
+    public void setPkgSingleMax(Double pkgSingleMax) {
+        this.pkgSingleMax = pkgSingleMax;
     }
 
-    public Double getIndependentMin() {
-        return independentMin;
+    public Double getPkgSingleMin() {
+        return pkgSingleMin;
     }
 
-    public void setIndependentMin(Double independentMin) {
-        this.independentMin = independentMin;
+    public void setPkgSingleMin(Double pkgSingleMin) {
+        this.pkgSingleMin = pkgSingleMin;
     }
 
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/ProjectOtherSetting.java

@@ -7,14 +7,17 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 印刷项目其他设置
+ * 印刷项目-其它设置信息
  */
 @Entity
-@Table(name = "ec_prt_project_other_setting")
+@Table(name = "ec_prt_project_other_setting", indexes = {
+        @Index(name = "INDEX_PRT_PROJECT_OTHER_01", columnList = "projectId")})
 public class ProjectOtherSetting extends IdEntity {
     /**
      * 项目ID
@@ -23,6 +26,7 @@ public class ProjectOtherSetting extends IdEntity {
     /**
      * 备注
      */
+    @Column(length = 1000)
     private String remark;
 
     public Long getProjectId() {

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/QuestionTypeNum.java → examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/QuestionStatistic.java

@@ -7,28 +7,33 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 试题类型----试题数量
+ * 试题统计信息
  */
 @Entity
-@Table(name = "ec_prt_question_type_num")
-public class QuestionTypeNum extends IdEntity {
+@Table(name = "ec_prt_question_statistic", indexes = {
+        @Index(name = "INDEX_PRT_QUESTION_STATISTIC_01", columnList = "examStructureId")})
+public class QuestionStatistic extends IdEntity {
     /**
      * 考试试卷结构
      */
     private Long examStructureId;
     /**
      * 试题类型
-     * See QuesStructType.java
+     *
+     * @See QuesStructType.java
      */
+    @Column(length = 50)
     private String questionType;
     /**
      * 试题数量
      */
-    private Integer quantity;
+    private Integer questionTotal;
 
     public Long getExamStructureId() {
         return examStructureId;
@@ -46,12 +51,12 @@ public class QuestionTypeNum extends IdEntity {
         this.questionType = questionType;
     }
 
-    public Integer getQuantity() {
-        return quantity;
+    public Integer getQuestionTotal() {
+        return questionTotal;
     }
 
-    public void setQuantity(Integer quantity) {
-        this.quantity = quantity;
+    public void setQuestionTotal(Integer questionTotal) {
+        this.questionTotal = questionTotal;
     }
 
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/entity/SubjectiveQuestionStructure.java

@@ -7,40 +7,47 @@
 
 package cn.com.qmth.examcloud.core.print.entity;
 
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.Index;
 import javax.persistence.Table;
 
 /**
- * 主观题数据--用于Excel导出
+ * 主观题信息(用于Excel导出)
  */
 @Entity
-@Table(name = "ec_prt_subjective_question_structure")
+@Table(name = "ec_prt_subjective_question_structure", indexes = {
+        @Index(name = "INDEX_PRT_SUBJECTIVE_QUESTION_01", columnList = "examId")})
 public class SubjectiveQuestionStructure extends IdEntity {
     /**
      * 考试ID
      */
     private Long examId;
     /**
-     * 试卷id
+     * 试卷ID
      */
+    @Column(length = 50)
     private String paperId;
     /**
      * 课程代码
      */
     //@ExcelProperty(name = "科目代码", index = 0)
-    private String courseNo;
+    @Column(length = 50)
+    private String courseCode;
     /**
      * 课程名称
      */
     //@ExcelProperty(name = "科目名称", index = 1)
+    @Column(length = 50)
     private String courseName;
     /**
      * 试卷名称
      */
     //@ExcelProperty(name = "试卷名称", index = 2)
+    @Column(length = 50)
     private String paperName;
     /**
-     * 试卷类型
+     * 试卷类型(如：A、B)
      */
     //@ExcelProperty(name = "试卷类型", index = 3)
     private String paperType;
@@ -48,22 +55,24 @@ public class SubjectiveQuestionStructure extends IdEntity {
      * 大题号
      */
     //@ExcelProperty(name = "大题号", index = 4)
-    private Integer bigQuestionNo;
+    @Column(length = 50)
+    private Integer sectionNum;
     /**
      * 大题名称
      */
     //@ExcelProperty(name = "大题名称", index = 5)
-    private String bigQuestionName;
+    @Column(length = 100)
+    private String sectionName;
     /**
      * 小题号
      */
     //@ExcelProperty(name = "小题号", index = 6)
-    private Integer smallQuestionNo;
+    private Integer unitNum;
     /**
      * 小题分数
      */
     //@ExcelProperty(name = "满分", index = 7)
-    private Double questionScore;
+    private Double unitScore;
 
     public Long getExamId() {
         return examId;
@@ -81,12 +90,12 @@ public class SubjectiveQuestionStructure extends IdEntity {
         this.paperId = paperId;
     }
 
-    public String getCourseNo() {
-        return courseNo;
+    public String getCourseCode() {
+        return courseCode;
     }
 
-    public void setCourseNo(String courseNo) {
-        this.courseNo = courseNo;
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
     }
 
     public String getCourseName() {
@@ -113,36 +122,36 @@ public class SubjectiveQuestionStructure extends IdEntity {
         this.paperType = paperType;
     }
 
-    public Integer getBigQuestionNo() {
-        return bigQuestionNo;
+    public Integer getSectionNum() {
+        return sectionNum;
     }
 
-    public void setBigQuestionNo(Integer bigQuestionNo) {
-        this.bigQuestionNo = bigQuestionNo;
+    public void setSectionNum(Integer sectionNum) {
+        this.sectionNum = sectionNum;
     }
 
-    public String getBigQuestionName() {
-        return bigQuestionName;
+    public String getSectionName() {
+        return sectionName;
     }
 
-    public void setBigQuestionName(String bigQuestionName) {
-        this.bigQuestionName = bigQuestionName;
+    public void setSectionName(String sectionName) {
+        this.sectionName = sectionName;
     }
 
-    public Integer getSmallQuestionNo() {
-        return smallQuestionNo;
+    public Integer getUnitNum() {
+        return unitNum;
     }
 
-    public void setSmallQuestionNo(Integer smallQuestionNo) {
-        this.smallQuestionNo = smallQuestionNo;
+    public void setUnitNum(Integer unitNum) {
+        this.unitNum = unitNum;
     }
 
-    public Double getQuestionScore() {
-        return questionScore;
+    public Double getUnitScore() {
+        return unitScore;
     }
 
-    public void setQuestionScore(Double questionScore) {
-        this.questionScore = questionScore;
+    public void setUnitScore(Double unitScore) {
+        this.unitScore = unitScore;
     }
 
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/repository/QuestionTypeNumRepository.java → examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/repository/CourseStatisticRepository.java

@@ -7,12 +7,12 @@
 
 package cn.com.qmth.examcloud.core.print.repository;
 
-import cn.com.qmth.examcloud.core.print.entity.QuestionTypeNum;
+import cn.com.qmth.examcloud.core.print.entity.CourseStatistic;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface QuestionTypeNumRepository extends JpaRepository<QuestionTypeNum, Long>, JpaSpecificationExecutor<QuestionTypeNum> {
+public interface CourseStatisticRepository extends JpaRepository<CourseStatistic, Long>, JpaSpecificationExecutor<CourseStatistic> {
 
 }

examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/repository/CourseStatisticsRepository.java → examcloud-core-print-dao/src/main/java/cn/com/qmth/examcloud/core/print/repository/QuestionStatisticRepository.java

@@ -7,12 +7,12 @@
 
 package cn.com.qmth.examcloud.core.print.repository;
 
-import cn.com.qmth.examcloud.core.print.entity.CourseStatistics;
+import cn.com.qmth.examcloud.core.print.entity.QuestionStatistic;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface CourseStatisticsRepository extends JpaRepository<CourseStatistics, Long>, JpaSpecificationExecutor<CourseStatistics> {
+public interface QuestionStatisticRepository extends JpaRepository<QuestionStatistic, Long>, JpaSpecificationExecutor<QuestionStatistic> {
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/CourseStatisticsService.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/CourseStatisticService.java

@@ -11,6 +11,6 @@ package cn.com.qmth.examcloud.core.print.service;
  * @author: fengdesheng
  * @since: 2018/10/22
  */
-public interface CourseStatisticsService {
+public interface CourseStatisticService {
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/QuestionTypeNumService.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/QuestionStatisticService.java

@@ -11,6 +11,6 @@ package cn.com.qmth.examcloud.core.print.service;
  * @author: fengdesheng
  * @since: 2018/10/22
  */
-public interface QuestionTypeNumService {
+public interface QuestionStatisticService {
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticsServiceImpl.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CourseStatisticServiceImpl.java

@@ -7,8 +7,8 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.core.print.repository.CourseStatisticsRepository;
-import cn.com.qmth.examcloud.core.print.service.CourseStatisticsService;
+import cn.com.qmth.examcloud.core.print.repository.CourseStatisticRepository;
+import cn.com.qmth.examcloud.core.print.service.CourseStatisticService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,8 +17,8 @@ import org.springframework.stereotype.Service;
  * @since: 2018/10/17
  */
 @Service
-public class CourseStatisticsServiceImpl implements CourseStatisticsService {
+public class CourseStatisticServiceImpl implements CourseStatisticService {
     @Autowired
-    private CourseStatisticsRepository courseStatisticsRepository;
+    private CourseStatisticRepository courseStatisticsRepository;
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/QuestionTypeNumServiceImpl.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/QuestionStatisticServiceImpl.java

@@ -7,8 +7,8 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
-import cn.com.qmth.examcloud.core.print.repository.QuestionTypeNumRepository;
-import cn.com.qmth.examcloud.core.print.service.QuestionTypeNumService;
+import cn.com.qmth.examcloud.core.print.repository.QuestionStatisticRepository;
+import cn.com.qmth.examcloud.core.print.service.QuestionStatisticService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,8 +17,8 @@ import org.springframework.stereotype.Service;
  * @since: 2018/10/17
  */
 @Service
-public class QuestionTypeNumServiceImpl implements QuestionTypeNumService {
+public class QuestionStatisticServiceImpl implements QuestionStatisticService {
     @Autowired
-    private QuestionTypeNumRepository questionTypeNumRepository;
+    private QuestionStatisticRepository questionTypeNumRepository;
 
 }