公用查询条件修改

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseClazz.java

@@ -28,6 +28,11 @@ public class TAExamCourseClazz implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -74,6 +79,14 @@ public class TAExamCourseClazz implements Serializable {
     @TableField(value = "college_name")
     private String collegeName;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public String getCourseName() {
         return courseName;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeInspect.java

@@ -28,6 +28,11 @@ public class TAExamCourseCollegeInspect implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -94,6 +99,14 @@ public class TAExamCourseCollegeInspect implements Serializable {
     @TableField(value = "relative_position")
     private BigDecimal relativePosition;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public String getCourseName() {
         return courseName;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeInspectDio.java

@@ -28,6 +28,11 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -62,6 +67,14 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     @TableField(value = "score_rate")
     private BigDecimal scoreRate;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public String getCourseCode() {
         return courseCode;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseCollegeTeacher.java

@@ -28,6 +28,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -107,6 +112,14 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     @TableField(value = "college_name")
     private String collegeName;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseDio.java

@@ -28,6 +28,11 @@ public class TAExamCourseDio implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -66,6 +71,14 @@ public class TAExamCourseDio implements Serializable {
     @TableField(value = "total_count")
     private BigDecimal totalCount;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecord.java

@@ -28,6 +28,11 @@ public class TAExamCourseRecord implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "基础考生成绩记录表id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_record_id")
@@ -61,6 +66,14 @@ public class TAExamCourseRecord implements Serializable {
     @TableField(value = "standardized_coefficients")
     private BigDecimal standardizedCoefficients;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordDio.java

@@ -28,6 +28,11 @@ public class TAExamCourseRecordDio implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "基础考生成绩记录表id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_record_id")
@@ -58,6 +63,14 @@ public class TAExamCourseRecordDio implements Serializable {
     @TableField(value = "proficiency")
     private String proficiency;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseRecordMod.java

@@ -28,6 +28,11 @@ public class TAExamCourseRecordMod implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "基础考生成绩表id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_record_id")
@@ -70,6 +75,14 @@ public class TAExamCourseRecordMod implements Serializable {
     @TableField(value = "level")
     private String level;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamCourseTeacher.java

@@ -28,6 +28,11 @@ public class TAExamCourseTeacher implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -98,6 +103,14 @@ public class TAExamCourseTeacher implements Serializable {
     @TableField(value = "total_count")
     private Integer totalCount;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAExamTotal.java

@@ -27,6 +27,11 @@ public class TAExamTotal implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "基础考试表id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -64,6 +69,14 @@ public class TAExamTotal implements Serializable {
     @TableField(value = "exam_time")
     private String examTime;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/entity/TAPaperStruct.java

@@ -28,6 +28,11 @@ public class TAPaperStruct implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id（冗余）")
+    @JsonSerialize(using = ToStringSerializer.class)
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "基础试卷结构表id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "paper_struct_id")
@@ -45,6 +50,14 @@ public class TAPaperStruct implements Serializable {
     @TableField(value = "validity")
     private BigDecimal validity;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }

teachcloud-report-business/src/main/resources/db/init-table.sql

@@ -784,6 +784,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_clazz`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_clazz` (
   `id` bigint(20) NOT NULL COMMENT 'id',
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `course_code` varchar(100) NOT NULL COMMENT '科目编码',
   `course_name` varchar(100) NOT NULL COMMENT '科目名称',
@@ -817,6 +818,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_college_inspect`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_college_inspect` (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `course_code` varchar(100) NOT NULL COMMENT '科目编码',
   `course_name` varchar(100) NOT NULL COMMENT '科目名称',
@@ -855,6 +857,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_college_inspect_dio`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_college_inspect_dio` (
   `id` bigint(20) NOT NULL COMMENT 'id',
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `course_code` varchar(100) NOT NULL COMMENT '科目编码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
@@ -885,6 +888,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_college_teacher`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_college_teacher` (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `course_code` varchar(100) NOT NULL COMMENT '科目编码',
   `teacher_id` bigint(20) NOT NULL COMMENT '授课教师id',
@@ -962,6 +966,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_dio`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_dio` (
   `id` bigint(20) NOT NULL COMMENT 'id',
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `course_code` varchar(100) NOT NULL COMMENT '科目编码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
@@ -993,6 +998,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_record`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_record` (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_record_id` bigint(20) NOT NULL COMMENT '基础考生成绩记录表id',
   `total_score` decimal(12,4) DEFAULT NULL COMMENT '卷面成绩（冗余）',
   `assigned_score` decimal(12,4) DEFAULT NULL COMMENT '赋分后成绩',
@@ -1037,6 +1043,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_record_dio`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_record_dio` (
   `id` bigint(20) NOT NULL COMMENT 'id',
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_record_id` bigint(20) NOT NULL COMMENT '基础考生成绩记录表id',
   `paper_id` bigint(20) NOT NULL COMMENT '试卷id',
   `dimension_type` varchar(32) DEFAULT NULL COMMENT '模块类型',
@@ -1066,6 +1073,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_record_mod`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_record_mod` (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_record_id` bigint(20) NOT NULL COMMENT '基础考生成绩表id',
   `paper_id` bigint(20) NOT NULL COMMENT '试卷id',
   `module_type` varchar(32) DEFAULT NULL COMMENT '考察模块名称',
@@ -1098,6 +1106,7 @@ DROP TABLE IF EXISTS `t_a_exam_course_teacher`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_course_teacher` (
   `id` bigint(20) NOT NULL COMMENT 'id',
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `course_code` varchar(100) NOT NULL COMMENT '科目编码',
   `course_name` varchar(100) DEFAULT NULL COMMENT '科目名称',
@@ -1137,6 +1146,7 @@ DROP TABLE IF EXISTS `t_a_exam_total`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_exam_total` (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '基础考试表id',
   `college_count` int(11) DEFAULT NULL COMMENT '考察学院总数',
   `course_count` int(11) DEFAULT NULL COMMENT '课程总数',
@@ -1171,6 +1181,7 @@ DROP TABLE IF EXISTS `t_a_paper_struct`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_a_paper_struct` (
   `id` bigint(20) NOT NULL,
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `paper_struct_id` bigint(20) NOT NULL COMMENT '基础试卷结构表id',
   `score_rate` decimal(12,4) DEFAULT NULL COMMENT '得分率',
   `difficult` varchar(32) DEFAULT NULL COMMENT '难度',