增加report模块

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TAExamCourse.java

@@ -33,10 +33,9 @@ public class TAExamCourse implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "科目id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
 
     @ApiModelProperty(value = "学校id（冗余）")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -47,7 +46,7 @@ public class TAExamCourse implements Serializable {
     @TableField(value = "exam_name")
     private String examName;
 
-    @ApiModelProperty(value = "课程名称（冗余）")
+    @ApiModelProperty(value = "科目名称")
     @TableField(value = "course_name")
     private String courseName;
 
@@ -127,12 +126,12 @@ public class TAExamCourse implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
     }
 
     public Long getSchoolId() {

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

@@ -33,10 +33,13 @@ public class TAExamCourseClazz implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "科目id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "班级表id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -71,6 +74,14 @@ public class TAExamCourseClazz implements Serializable {
     @TableField(value = "college_name")
     private String collegeName;
 
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -91,12 +102,12 @@ public class TAExamCourseClazz implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
     }
 
     public Long getClazzId() {

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

@@ -33,10 +33,13 @@ public class TAExamCourseCollegeInspect implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "学院id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -91,6 +94,14 @@ public class TAExamCourseCollegeInspect implements Serializable {
     @TableField(value = "relative_position")
     private BigDecimal relativePosition;
 
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -111,12 +122,12 @@ public class TAExamCourseCollegeInspect implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
     }
 
     public Long getCollegeId() {

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

@@ -33,10 +33,13 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "学院id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -59,6 +62,22 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     @TableField(value = "score_rate")
     private BigDecimal scoreRate;
 
+    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 static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -79,14 +98,6 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
-    }
-
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
-    }
-
     public Long getCollegeId() {
         return collegeId;
     }

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

@@ -33,10 +33,13 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "学院id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -124,12 +127,20 @@ public class TAExamCourseCollegeTeacher implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public Long getCollegeId() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TAExamCourseDifficult.java

@@ -33,10 +33,13 @@ public class TAExamCourseDifficult implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "学院id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -88,12 +91,20 @@ public class TAExamCourseDifficult implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public Long getCollegeId() {

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

@@ -33,10 +33,13 @@ public class TAExamCourseDio implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "试卷id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -83,12 +86,20 @@ public class TAExamCourseDio implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public Long getPaperId() {

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

@@ -33,10 +33,13 @@ public class TAExamCourseTeacher implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "教师id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -115,12 +118,20 @@ public class TAExamCourseTeacher implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public Long getTeacherId() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBCommonLevelConfig.java

@@ -32,10 +32,13 @@ public class TBCommonLevelConfig implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "等级类型（熟练度、百分等级、题目难度）")
     @TableField(value = "level_type")
@@ -81,12 +84,20 @@ public class TBCommonLevelConfig implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getLevelType() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBCommonRankLevelConfig.java

@@ -33,10 +33,13 @@ public class TBCommonRankLevelConfig implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "等级")
     @TableField(value = "level")
@@ -78,12 +81,20 @@ public class TBCommonRankLevelConfig implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getLevel() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBDimension.java

@@ -32,10 +32,13 @@ public class TBDimension implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "维度类型 - 知识，能力，素养")
     @TableField(value = "dimension_type")
@@ -81,12 +84,20 @@ public class TBDimension implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getDimensionType() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBExamStudent.java

@@ -36,10 +36,13 @@ public class TBExamStudent implements Serializable {
     @TableField(value = "student_id")
     private Long studentId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "开课学院id")
     @JsonSerialize(using = ToStringSerializer.class)
@@ -110,12 +113,20 @@ public class TBExamStudent implements Serializable {
         this.studentId = studentId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public Long getTeachCollegeId() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBModuleConfig.java

@@ -17,7 +17,7 @@ import java.io.Serializable;
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value="TBModuleConfig对象", description="考察点模块配置表")
+@ApiModel(value = "TBModuleConfig对象", description = "考察点模块配置表")
 public class TBModuleConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -32,10 +32,13 @@ public class TBModuleConfig implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "模块类型（知识、维度、素养）")
     @TableField(value = "module_type")
@@ -89,12 +92,20 @@ public class TBModuleConfig implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getModuleType() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBModuleProficiency.java

@@ -32,10 +32,13 @@ public class TBModuleProficiency implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "模块类型")
     @TableField(value = "module_type")
@@ -89,12 +92,20 @@ public class TBModuleProficiency implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getModuleType() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBPaper.java

@@ -33,10 +33,13 @@ public class TBPaper implements Serializable {
     @TableField(value = "exam_id")
     private Long examId;
 
-    @ApiModelProperty(value = "课程id")
-    @JsonSerialize(using = ToStringSerializer.class)
-    @TableField(value = "course_id")
-    private Long courseId;
+    @ApiModelProperty(value = "科目编码")
+    @TableField(value = "course_code")
+    private String courseCode;
+
+    @ApiModelProperty(value = "科目名称")
+    @TableField(value = "course_name")
+    private String courseName;
 
     @ApiModelProperty(value = "试卷类型")
     @TableField(value = "paper_type")
@@ -86,12 +89,20 @@ public class TBPaper implements Serializable {
         this.examId = examId;
     }
 
-    public Long getCourseId() {
-        return courseId;
+    public String getCourseCode() {
+        return courseCode;
+    }
+
+    public void setCourseCode(String courseCode) {
+        this.courseCode = courseCode;
+    }
+
+    public String getCourseName() {
+        return courseName;
     }
 
-    public void setCourseId(Long courseId) {
-        this.courseId = courseId;
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
     }
 
     public String getPaperType() {

teachcloud-report/src/main/java/com/qmth/teachcloud/report/entity/TBSchoolTeacher.java

@@ -31,7 +31,7 @@ public class TBSchoolTeacher extends BaseEntity implements Serializable {
     @TableField(value = "teacher_code")
     private String teacherCode;
 
-    @ApiModelProperty(value = "教师名称你能")
+    @ApiModelProperty(value = "教师名称")
     @TableField(value = "teacher_name")
     private String teacherName;