数据库字段调整

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

@@ -20,11 +20,10 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "ec_prt_course_paper", indexes = {
         @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")})
+        @Index(name = "INDEX_PRT_COURSE_PAPER_02", columnList = "examId")})
 public class CoursePaper extends IdEntity {
     /**
-     * 机构ID
+     * 学校机构ID
      */
     private Long orgId;
     /**
@@ -36,12 +35,15 @@ public class CoursePaper extends IdEntity {
      */
     @Column(length = 50)
     private String paperId;
+    /**
+     * 课程ID
+     */
+    private Long courseId;
     /**
      * 课程code
      */
     @Column(length = 50)
     private String courseCode;
-    private Long courseId;
     /**
      * 课程名称
      */

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

@@ -20,11 +20,10 @@ import javax.persistence.Table;
 @Entity
 @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")})
+        @Index(name = "INDEX_PRT_COURSE_STATISTIC_02", columnList = "examId")})
 public class CourseStatistic extends IdEntity {
     /**
-     * 机构ID
+     * 学校机构ID
      */
     private Long orgId;
     /**
@@ -35,12 +34,15 @@ public class CourseStatistic extends IdEntity {
      * 绑定试卷ID(表ec_prt_course_paper的ID)
      */
     private Long coursePaperId;
+    /**
+     * 课程ID
+     */
+    private Long courseId;
     /**
      * 课程code
      */
     @Column(length = 50)
     private String courseCode;
-    private Long courseId;
     /**
      * 课程名称
      */

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

@@ -20,28 +20,18 @@ import javax.persistence.Table;
 @Entity
 @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")})
+        @Index(name = "INDEX_PRT_EXAM_STRUCTURE_02", columnList = "examId")})
 public class ExamStructure extends IdEntity {
     /**
      * 考试ID
      */
     private Long examId;
     /**
-     * 机构ID
+     * 学校机构ID
      */
     private Long orgId;
     /**
-     * 学校ID(表ecs_core_org的ID)
-     */
-    private Long schoolId;
-    /**
-     * 学校名称
-     */
-    @Column(length = 50)
-    private String schoolName;
-    /**
-     * 机构名
+     * 学校机构名称
      */
     @Column(length = 50)
     private String orgName;
@@ -74,30 +64,6 @@ public class ExamStructure extends IdEntity {
         this.orgId = orgId;
     }
 
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public Long getSchoolId() {
-        return schoolId;
-    }
-
-    public void setSchoolId(Long schoolId) {
-        this.schoolId = schoolId;
-    }
-
-    public String getSchoolName() {
-        return schoolName;
-    }
-
-    public void setSchoolName(String schoolName) {
-        this.schoolName = schoolName;
-    }
-
     public String getOrgName() {
         return orgName;
     }
@@ -106,6 +72,14 @@ public class ExamStructure extends IdEntity {
         this.orgName = orgName;
     }
 
+    public String getExamName() {
+        return examName;
+    }
+
+    public void setExamName(String examName) {
+        this.examName = examName;
+    }
+
     public String getExamType() {
         return examType;
     }

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

@@ -19,7 +19,8 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "ec_prt_objective_question_structure", indexes = {
-        @Index(name = "INDEX_PRT_OBJECTIVE_QUESTION_01", columnList = "examId")})
+        @Index(name = "INDEX_PRT_OBJECTIVE_QUESTION_01", columnList = "examId"),
+        @Index(name = "INDEX_PRT_OBJECTIVE_QUESTION_02", columnList = "paperId")})
 public class ObjectiveQuestionStructure extends IdEntity {
     /**
      * 考试ID
@@ -30,13 +31,16 @@ public class ObjectiveQuestionStructure extends IdEntity {
      */
     @Column(length = 50)
     private String paperId;
+    /**
+     * 课程ID
+     */
+    private Long courseId;
     /**
      * 课程代码
      */
     //@ExcelProperty(name = "课程代码", index = 0)
     @Column(length = 50)
     private String courseCode;
-    private Long courseId;
     /**
      * 课程名称
      */

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

@@ -24,7 +24,7 @@ import java.util.Date;
         @Index(name = "INDEX_PRT_PROJECT_02", columnList = "examId")})
 public class PrintingProject extends IdEntity {
     /**
-     * 机构ID
+     * 学校机构ID
      */
     private Long orgId;
     /**
@@ -37,7 +37,7 @@ public class PrintingProject extends IdEntity {
     @Column(length = 50)
     private String examName;
     /**
-     * 机构名称
+     * 学校机构名称
      */
     @Column(length = 50)
     private String orgName;

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

@@ -21,7 +21,7 @@ import javax.persistence.*;
         @Index(name = "INDEX_PRT_TEMPLATE_02", columnList = "examId")})
 public class PrintingTemplate extends IdEntity {
     /**
-     * 机构ID
+     * 学校机构ID
      */
     private Long orgId;
     /**
@@ -29,7 +29,7 @@ public class PrintingTemplate extends IdEntity {
      */
     private Long examId;
     /**
-     * 机构名称
+     * 学校机构名称
      */
     @Column(length = 50)
     private String orgName;

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

@@ -22,7 +22,7 @@ import javax.persistence.Table;
         @Index(name = "INDEX_PRT_QUESTION_STATISTIC_01", columnList = "examStructureId")})
 public class QuestionStatistic extends IdEntity {
     /**
-     * 考试试卷结构
+     * 考试试卷结构ID
      */
     private Long examStructureId;
     /**

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

@@ -19,7 +19,8 @@ import javax.persistence.Table;
  */
 @Entity
 @Table(name = "ec_prt_subjective_question_structure", indexes = {
-        @Index(name = "INDEX_PRT_SUBJECTIVE_QUESTION_01", columnList = "examId")})
+        @Index(name = "INDEX_PRT_SUBJECTIVE_QUESTION_01", columnList = "examId"),
+        @Index(name = "INDEX_PRT_SUBJECTIVE_QUESTION_02", columnList = "paperId")})
 public class SubjectiveQuestionStructure extends IdEntity {
     /**
      * 考试ID
@@ -30,13 +31,16 @@ public class SubjectiveQuestionStructure extends IdEntity {
      */
     @Column(length = 50)
     private String paperId;
+    /**
+     * 课程ID
+     */
+    private Long courseId;
     /**
      * 课程代码
      */
     //@ExcelProperty(name = "科目代码", index = 0)
     @Column(length = 50)
     private String courseCode;
-    private Long courseId;
     /**
      * 课程名称
      */

examcloud-core-print-dao/src/main/resources/db-schema.sql

@@ -4,8 +4,8 @@ CREATE TABLE ec_prt_course_paper (
   creation_time   datetime            DEFAULT NULL,
   update_time     datetime            DEFAULT NULL,
   answer_file_url varchar(200)        DEFAULT NULL,
-  course_id       bigint(20)          DEFAULT NULL,
   course_code     varchar(50)         DEFAULT NULL,
+  course_id       bigint(20)          DEFAULT NULL,
   course_name     varchar(50)         DEFAULT NULL,
   exam_id         bigint(20)          DEFAULT NULL,
   org_id          bigint(20)          DEFAULT NULL,
@@ -15,8 +15,7 @@ CREATE TABLE ec_prt_course_paper (
   paper_p         int(11)             DEFAULT NULL,
   PRIMARY KEY (id),
   KEY INDEX_PRT_COURSE_PAPER_01 (org_id),
-  KEY INDEX_PRT_COURSE_PAPER_02 (exam_id),
-  KEY INDEX_PRT_COURSE_PAPER_03 (course_code)
+  KEY INDEX_PRT_COURSE_PAPER_02 (exam_id)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8;
 
 
@@ -25,8 +24,8 @@ CREATE TABLE ec_prt_course_statistic (
   id              bigint(20) NOT NULL AUTO_INCREMENT,
   creation_time   datetime            DEFAULT NULL,
   update_time     datetime            DEFAULT NULL,
-  course_id       bigint(20)          DEFAULT NULL,
   course_code     varchar(50)         DEFAULT NULL,
+  course_id       bigint(20)          DEFAULT NULL,
   course_name     varchar(50)         DEFAULT NULL,
   course_paper_id bigint(20)          DEFAULT NULL,
   exam_id         bigint(20)          DEFAULT NULL,
@@ -34,8 +33,7 @@ CREATE TABLE ec_prt_course_statistic (
   paper_type      varchar(50)         DEFAULT NULL,
   PRIMARY KEY (id),
   KEY INDEX_PRT_COURSE_STATISTIC_01 (org_id),
-  KEY INDEX_PRT_COURSE_STATISTIC_02 (exam_id),
-  KEY INDEX_PRT_COURSE_STATISTIC_03 (course_paper_id)
+  KEY INDEX_PRT_COURSE_STATISTIC_02 (exam_id)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8;
 
 
@@ -49,12 +47,9 @@ CREATE TABLE ec_prt_exam_structure (
   exam_type     varchar(50)         DEFAULT NULL,
   org_id        bigint(20)          DEFAULT NULL,
   org_name      varchar(50)         DEFAULT NULL,
-  school_id     bigint(20)          DEFAULT NULL,
-  school_name   varchar(50)         DEFAULT NULL,
   PRIMARY KEY (id),
   KEY INDEX_PRT_EXAM_STRUCTURE_01 (org_id),
-  KEY INDEX_PRT_EXAM_STRUCTURE_02 (exam_id),
-  KEY INDEX_PRT_EXAM_STRUCTURE_03 (school_id)
+  KEY INDEX_PRT_EXAM_STRUCTURE_02 (exam_id)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8;
 
 
@@ -64,8 +59,8 @@ CREATE TABLE ec_prt_objective_question_structure (
   creation_time datetime            DEFAULT NULL,
   update_time   datetime            DEFAULT NULL,
   answer        varchar(50)         DEFAULT NULL,
-  course_id     bigint(20)          DEFAULT NULL,
   course_code   varchar(50)         DEFAULT NULL,
+  course_id     bigint(20)          DEFAULT NULL,
   course_name   varchar(50)         DEFAULT NULL,
   exam_id       bigint(20)          DEFAULT NULL,
   paper_id      varchar(50)         DEFAULT NULL,
@@ -76,7 +71,8 @@ CREATE TABLE ec_prt_objective_question_structure (
   unit_num      int(11)             DEFAULT NULL,
   unit_score    double              DEFAULT NULL,
   PRIMARY KEY (id),
-  KEY INDEX_PRT_OBJECTIVE_QUESTION_01 (exam_id)
+  KEY INDEX_PRT_OBJECTIVE_QUESTION_01 (exam_id),
+  KEY INDEX_PRT_OBJECTIVE_QUESTION_02 (paper_id)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8;
 
 
@@ -154,8 +150,8 @@ CREATE TABLE ec_prt_subjective_question_structure (
   id            bigint(20) NOT NULL AUTO_INCREMENT,
   creation_time datetime            DEFAULT NULL,
   update_time   datetime            DEFAULT NULL,
-  course_id     bigint(20)          DEFAULT NULL,
   course_code   varchar(50)         DEFAULT NULL,
+  course_id     bigint(20)          DEFAULT NULL,
   course_name   varchar(50)         DEFAULT NULL,
   exam_id       bigint(20)          DEFAULT NULL,
   paper_id      varchar(50)         DEFAULT NULL,
@@ -166,7 +162,8 @@ CREATE TABLE ec_prt_subjective_question_structure (
   unit_num      int(11)             DEFAULT NULL,
   unit_score    double              DEFAULT NULL,
   PRIMARY KEY (id),
-  KEY INDEX_PRT_SUBJECTIVE_QUESTION_01 (exam_id)
+  KEY INDEX_PRT_SUBJECTIVE_QUESTION_01 (exam_id),
+  KEY INDEX_PRT_SUBJECTIVE_QUESTION_02 (paper_id)
 ) ENGINE = InnoDB DEFAULT CHARSET = utf8;