学生模板接口

teachcloud-common/src/main/java/com/qmth/teachcloud/common/domain/PrefixUrlDomain.java

@@ -29,6 +29,16 @@ public class PrefixUrlDomain implements Serializable {
 
     String reportSchool;
 
+    String reportCourse;
+
+    public String getReportCourse() {
+        return reportCourse;
+    }
+
+    public void setReportCourse(String reportCourse) {
+        this.reportCourse = reportCourse;
+    }
+
     public String getReportWuda() {
         return reportWuda;
     }

teachcloud-common/src/main/java/com/qmth/teachcloud/common/util/ServletUtil.java

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.common.util;
 import com.alibaba.fastjson.JSONObject;
 import com.qmth.boot.core.enums.Platform;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicSchool;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -151,13 +150,13 @@ public class ServletUtil {
      * @return
      */
     public static Object getRequestHeaderSchoolId() {
-        BasicSchool basicSchool = (BasicSchool) getRequestSchool();
-        return basicSchool.getId();
-//        Object object = getRequest().getHeader(SystemConstant.SCHOOL_ID);
-//        if (Objects.isNull(object)) {
-//            throw ExceptionResultEnum.NOT_LOGIN.exception();
-//        }
-//        return object;
+//        BasicSchool basicSchool = (BasicSchool) getRequestSchool();
+//        return basicSchool.getId();
+        Object object = getRequest().getHeader(SystemConstant.SCHOOL_ID);
+        if (Objects.isNull(object)) {
+            throw ExceptionResultEnum.NOT_LOGIN.exception();
+        }
+        return object;
     }
 
     /**

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TAExamCourseResult.java

@@ -0,0 +1,135 @@
+package com.qmth.teachcloud.report.business.bean.result;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.Objects;
+
+/**
+ * @Description: TAExamCourseResult
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/6/8
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TAExamCourseResult extends TAExamCourse implements Serializable {
+
+    @ApiModelProperty(value = "全体平均分-赋分前")
+    private BigDecimal avgScoreBefore;
+
+    @ApiModelProperty(value = "全体不及格率-赋分前")
+    private BigDecimal notPassRateBefore;
+
+    @ApiModelProperty(value = "应届平均分-赋分前")
+    private BigDecimal currentAvgScoreBefore;
+
+    @ApiModelProperty(value = "应届不及格率-赋分前")
+    private BigDecimal currentNotPassRateBefore;
+
+    @ApiModelProperty(value = "全体平均分-赋分后")
+    private BigDecimal avgScoreAfter;
+
+    @ApiModelProperty(value = "全体不及格率-赋分后")
+    private BigDecimal notPassRateAfter;
+
+    @ApiModelProperty(value = "应届平均分-赋分后")
+    private BigDecimal currentAvgScoreAfter;
+
+    @ApiModelProperty(value = "应届不及格率-赋分后")
+    private BigDecimal currentNotPassRateAfter;
+
+    @ApiModelProperty(value = "发布状态（UN_COMPUTE：未计算、UN_PUBLISH：未发布、PUBLISH：已发布）")
+    private PublishStatusEnum status;
+
+    @ApiModelProperty(value = "发布状态（UN_COMPUTE：未计算、UN_PUBLISH：未发布、PUBLISH：已发布）")
+    private String publishStatus;
+
+    public PublishStatusEnum getStatus() {
+        return status;
+    }
+
+    public void setStatus(PublishStatusEnum status) {
+        this.status = status;
+    }
+
+    public String getPublishStatus() {
+        if (Objects.nonNull(status)) {
+            return status.getTitle();
+        } else {
+            return publishStatus;
+        }
+    }
+
+    public void setPublishStatus(String publishStatus) {
+        this.publishStatus = publishStatus;
+    }
+
+    public BigDecimal getAvgScoreBefore() {
+        return avgScoreBefore;
+    }
+
+    public void setAvgScoreBefore(BigDecimal avgScoreBefore) {
+        this.avgScoreBefore = avgScoreBefore;
+    }
+
+    public BigDecimal getNotPassRateBefore() {
+        return notPassRateBefore;
+    }
+
+    public void setNotPassRateBefore(BigDecimal notPassRateBefore) {
+        this.notPassRateBefore = notPassRateBefore;
+    }
+
+    public BigDecimal getCurrentAvgScoreBefore() {
+        return currentAvgScoreBefore;
+    }
+
+    public void setCurrentAvgScoreBefore(BigDecimal currentAvgScoreBefore) {
+        this.currentAvgScoreBefore = currentAvgScoreBefore;
+    }
+
+    public BigDecimal getCurrentNotPassRateBefore() {
+        return currentNotPassRateBefore;
+    }
+
+    public void setCurrentNotPassRateBefore(BigDecimal currentNotPassRateBefore) {
+        this.currentNotPassRateBefore = currentNotPassRateBefore;
+    }
+
+    public BigDecimal getAvgScoreAfter() {
+        return avgScoreAfter;
+    }
+
+    public void setAvgScoreAfter(BigDecimal avgScoreAfter) {
+        this.avgScoreAfter = avgScoreAfter;
+    }
+
+    public BigDecimal getNotPassRateAfter() {
+        return notPassRateAfter;
+    }
+
+    public void setNotPassRateAfter(BigDecimal notPassRateAfter) {
+        this.notPassRateAfter = notPassRateAfter;
+    }
+
+    public BigDecimal getCurrentAvgScoreAfter() {
+        return currentAvgScoreAfter;
+    }
+
+    public void setCurrentAvgScoreAfter(BigDecimal currentAvgScoreAfter) {
+        this.currentAvgScoreAfter = currentAvgScoreAfter;
+    }
+
+    public BigDecimal getCurrentNotPassRateAfter() {
+        return currentNotPassRateAfter;
+    }
+
+    public void setCurrentNotPassRateAfter(BigDecimal currentNotPassRateAfter) {
+        this.currentNotPassRateAfter = currentNotPassRateAfter;
+    }
+}

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TBExamResult.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.util.Objects;
 
 /**
- * @Description:
+ * @Description: TBExamResult
  * @Param:
  * @return:
  * @Author: wangliang

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/bean/result/TBExamStudentResult.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 /**
- * @Description:
+ * @Description: TBExamStudentResult
  * @Param:
  * @return:
  * @Author: wangliang

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/java/com/qmth/teachcloud/report/business/entity/TBExamCourse.java

@@ -22,6 +22,10 @@ public class TBExamCourse extends BaseEntity implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "学校id")
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @TableField(value = "exam_id")
     private Long examId;
@@ -42,6 +46,14 @@ public class TBExamCourse extends BaseEntity implements Serializable {
     @TableField(value = "publish_status")
     private PublishStatusEnum publishStatus;
 
+    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/TBExamStudent.java

@@ -27,6 +27,10 @@ public class TBExamStudent implements Serializable {
     @TableId(value = "id")
     private Long id;
 
+    @ApiModelProperty(value = "学校id")
+    @TableField(value = "school_id")
+    private Long schoolId;
+
     @ApiModelProperty(value = "考试id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "exam_id")
@@ -90,6 +94,14 @@ public class TBExamStudent implements Serializable {
     @TableField(value = "current")
     private Boolean current;
 
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
     public Long getExamId() {
         return examId;
     }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TAExamCourseMapper.java

@@ -1,7 +1,15 @@
 package com.qmth.teachcloud.report.business.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.google.common.primitives.Longs;
+import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +21,14 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourse;
  */
 public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
 
+    /**
+     * 开课课程考试总览列表接口
+     *
+     * @param iPage
+     * @param examId
+     * @param semester
+     * @param schoolId
+     * @return
+     */
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/mapper/TBExamStudentMapper.java

@@ -24,38 +24,42 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
     /**
      * 查询开课学院列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectTeachCollegeList(@Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TBExamStudentResult> selectTeachCollegeList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**
      * 查询考察学院列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectInspectCollegeList(@Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TBExamStudentResult> selectInspectCollegeList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**
      * 查询老师列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectTeachList(@Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TBExamStudentResult> selectTeachList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**
      * 查询班级列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectClassList(@Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TBExamStudentResult> selectClassList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**
      * 开课成绩查询

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TAExamCourseService.java

@@ -1,7 +1,13 @@
 package com.qmth.teachcloud.report.business.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -13,4 +19,14 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourse;
  */
 public interface TAExamCourseService extends IService<TAExamCourse> {
 
+    /**
+     * 开课课程考试总览列表接口
+     *
+     * @param iPage
+     * @param examId
+     * @param semester
+     * @param schoolId
+     * @return
+     */
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId);
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/TBExamStudentService.java

@@ -29,34 +29,37 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectTeachCollegeList(Long examId, String courseCode);
+    List<TBExamStudentResult> selectTeachCollegeList(Long schoolId, Long examId, String courseCode);
 
     /**
      * 查询考察学院列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectInspectCollegeList(Long examId, String courseCode);
+    List<TBExamStudentResult> selectInspectCollegeList(Long schoolId, Long examId, String courseCode);
 
     /**
      * 查询老师列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectTeachList(Long examId, String courseCode);
+    List<TBExamStudentResult> selectTeachList(Long schoolId, Long examId, String courseCode);
 
     /**
      * 查询班级列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectClassList(Long examId, String courseCode);
+    List<TBExamStudentResult> selectClassList(Long schoolId, Long examId, String courseCode);
 
     /**
      * 开课成绩查询
@@ -74,6 +77,13 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      */
     IPage<TeachCollegeResult> listTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize);
 
+    /**
+     * 导入异常考试类型
+     * @param examId
+     * @param file
+     * @throws IOException
+     * @throws NoSuchFieldException
+     */
     void importFile(Long examId, MultipartFile file) throws IOException, NoSuchFieldException;
 
     /**

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TAExamCourseServiceImpl.java

@@ -1,11 +1,18 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseService;
 import org.springframework.stereotype.Service;
 
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 考试课程维度分析表 服务实现类
@@ -17,4 +24,20 @@ import org.springframework.stereotype.Service;
 @Service
 public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAExamCourse> implements TAExamCourseService {
 
+    @Resource
+    TAExamCourseMapper taExamCourseMapper;
+
+    /**
+     * 开课课程考试总览列表接口
+     *
+     * @param iPage
+     * @param examId
+     * @param semester
+     * @param schoolId
+     * @return
+     */
+    @Override
+    public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId) {
+        return taExamCourseMapper.surveyTeacherList(iPage, examId, semester.name(), schoolId);
+    }
 }

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/service/impl/TBExamStudentServiceImpl.java

@@ -53,42 +53,53 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     /**
      * 查询开课学院列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
     @Override
-    public List<TBExamStudentResult> selectTeachCollegeList(Long examId, String courseCode) {
-        return tbExamStudentMapper.selectTeachCollegeList(examId, courseCode);
+    public List<TBExamStudentResult> selectTeachCollegeList(Long schoolId, Long examId, String courseCode) {
+        return tbExamStudentMapper.selectTeachCollegeList(schoolId, examId, courseCode);
     }
 
     /**
      * 查询考察学院列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
     @Override
-    public List<TBExamStudentResult> selectInspectCollegeList(Long examId, String courseCode) {
-        return tbExamStudentMapper.selectInspectCollegeList(examId, courseCode);
+    public List<TBExamStudentResult> selectInspectCollegeList(Long schoolId, Long examId, String courseCode) {
+        return tbExamStudentMapper.selectInspectCollegeList(schoolId, examId, courseCode);
     }
 
     /**
      * 查询老师列表
      *
+     * @param schoolId
      * @param examId
      * @param courseCode
      * @return
      */
     @Override
-    public List<TBExamStudentResult> selectTeachList(Long examId, String courseCode) {
-        return tbExamStudentMapper.selectTeachList(examId, courseCode);
+    public List<TBExamStudentResult> selectTeachList(Long schoolId, Long examId, String courseCode) {
+        return tbExamStudentMapper.selectTeachList(schoolId, examId, courseCode);
     }
 
+    /**
+     * 查询班级列表
+     *
+     * @param schoolId
+     * @param examId
+     * @param courseCode
+     * @return
+     */
     @Override
-    public List<TBExamStudentResult> selectClassList(Long examId, String courseCode) {
-        return tbExamStudentMapper.selectClassList(examId, courseCode);
+    public List<TBExamStudentResult> selectClassList(Long schoolId, Long examId, String courseCode) {
+        return tbExamStudentMapper.selectClassList(schoolId, examId, courseCode);
     }
 
     @Override

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 '难度',
@@ -1383,6 +1394,7 @@ DROP TABLE IF EXISTS `t_b_exam_course`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_b_exam_course` (
   `id` bigint(20) NOT NULL COMMENT '主键',
+  `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 '科目名称',
@@ -1443,6 +1455,7 @@ DROP TABLE IF EXISTS `t_b_exam_student`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_b_exam_student` (
   `id` bigint(20) NOT NULL COMMENT '主键',
+  `school_id` bigint DEFAULT NULL COMMENT '学校id',
   `exam_id` bigint(20) NOT NULL COMMENT '考试id',
   `name` varchar(100) NOT NULL COMMENT '姓名',
   `student_id` bigint(20) NOT NULL COMMENT '学生id',

teachcloud-report-business/src/main/resources/mapper/TAExamCourseMapper.xml

@@ -2,4 +2,39 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.teachcloud.report.business.mapper.TAExamCourseMapper">
 
+    <select id="surveyTeacherList" resultType="com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult">
+        select
+            taec.id,
+            taec.course_code as courseCode,
+            taec.course_name as courseName,
+            taec.teach_college_id as teachCollegeId,
+            taec.teach_college_name as teachCollegeName,
+            taec.inspect_college_count as inspectCollegeCount,
+            taec.reality_count as realityCount ,
+            taec.current_reality_rate as currentRealityRate,
+            taec.current_total_count as currentTotalCount,
+            taec.current_reality_count as currentRealityCount,
+            taec.past_reality_rate as pastRealityRate,
+            taec.past_total_count as pastTotalCount,
+            taec.past_reality_count as pastRealityCount,
+            taec.absent_count as absentCount,
+            taec.avg_score as avgScoreBefore,
+            (1 - taec.pass_rate) as notPassRateBefore,
+            taec.current_avg_score as currentAvgScoreBefore,
+            (1 - taec.current_pass_rate) as currentNotPassRateBefore
+        from t_a_exam_course taec
+        join t_b_exam tbe
+        on tbe.id = taec.exam_id
+        <where>
+            <if test="schoolId != null and schoolId != ''">
+                and taec.school_id = #{schoolId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and taec.exam_id = #{examId}
+            </if>
+            <if test="semester != null and semester != ''">
+                and tbe.semester = #{courseCode}
+            </if>
+        </where>
+    </select>
 </mapper>

teachcloud-report-business/src/main/resources/mapper/TBExamStudentMapper.xml

@@ -3,6 +3,9 @@
 <mapper namespace="com.qmth.teachcloud.report.business.mapper.TBExamStudentMapper">
 
     <sql id="conditionSql">
+        <if test="schoolId != null and schoolId != ''">
+            and tbes.school_id = #{schoolId}
+        </if>
         <if test="examId != null and examId != ''">
             and tbes.exam_id = #{examId}
         </if>
@@ -14,12 +17,12 @@
     <select id="selectTeachCollegeList" resultType="com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult">
         select
             DISTINCT tbes.teach_college_id as teachCollegeId,
-            tbsc.college_name as teachCollegeName,
-            tbsc.college_code as teachCollegeCode
+            so.name as teachCollegeName,
+            so.code as teachCollegeCode
         from
             t_b_exam_student tbes
-        join t_b_school_college tbsc on
-            tbsc.id = tbes.teach_college_id
+        join sys_org so on
+            so.id = tbes.teach_college_id
         <where>
            <include refid="conditionSql" />
         </where>
@@ -28,12 +31,12 @@
     <select id="selectInspectCollegeList" resultType="com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult">
         select
             DISTINCT tbes.inspect_college_id as inspectCollegeId,
-            tbsc.college_name as inspectCollegeName,
-            tbsc.college_code as inspectCollegeCode
+            so.name as inspectCollegeName,
+            so.code as inspectCollegeCode
         from
             t_b_exam_student tbes
-        join t_b_school_college tbsc on
-            tbsc.id = tbes.inspect_college_id
+        join sys_org so on
+            so.id = tbes.inspect_college_id
         <where>
             <include refid="conditionSql" />
         </where>
@@ -42,12 +45,11 @@
     <select id="selectTeachList" resultType="com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult">
         select
             DISTINCT tbes.teacher_id as teacherId,
-            tbst.teacher_name as teachName,
-            tbst.teacher_code as teachCode
+            su.real_name as teachName
         from
             t_b_exam_student tbes
-        join t_b_school_teacher tbst on
-            tbst.id = tbes.teacher_id
+        join sys_user su on
+            su.id = tbes.teacher_id
         <where>
             <include refid="conditionSql" />
         </where>

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -0,0 +1,51 @@
+package com.qmth.teachcloud.report.api;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.qmth.boot.api.constant.ApiConstant;
+import com.qmth.teachcloud.common.contant.SystemConstant;
+import com.qmth.teachcloud.common.util.Result;
+import com.qmth.teachcloud.common.util.ResultUtil;
+import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
+import com.qmth.teachcloud.report.business.service.TAExamCourseService;
+import io.swagger.annotations.*;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@Api(tags = "课程Controller")
+@RestController
+@RequestMapping(ApiConstant.DEFAULT_URI_PREFIX + "/${prefix.url.reportCourse}")
+public class CourseController {
+
+    @Resource
+    TAExamCourseService taExamCourseService;
+
+    @ApiOperation(value = "开课课程考试总览列表接口")
+    @RequestMapping(value = "/survey_teacher/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourse.class)})
+    public Result surveyTeacherList(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                    @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                    @ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                                    @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, SystemConstant.convertIdToLong(schoolId)));
+    }
+
+    @ApiOperation(value = "赋分管理列表接口")
+    @RequestMapping(value = "/survey_aspoints/list", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourse.class)})
+    public Result surveyAspointsList(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                                     @ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                     @ApiParam(value = "学院id", required = true) @RequestParam String collegeId,
+                                     @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
+                                     @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
+                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
+                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
+        return ResultUtil.ok();
+    }
+}

teachcloud-report/src/main/java/com/qmth/teachcloud/report/api/SysReportController.java

@@ -78,8 +78,10 @@ public class SysReportController {
     @ApiOperation(value = "课程列表")
     @RequestMapping(value = "/common/list_course", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "科目信息", response = TBExamCourse.class)})
-    public Result listCourse(@ApiParam(value = "考试id", required = true) @RequestParam String examId) {
+    public Result listCourse(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                             @ApiParam(value = "考试id", required = true) @RequestParam String examId) {
         QueryWrapper<TBExamCourse> tbExamCourseQueryWrapper = new QueryWrapper<>();
+        tbExamCourseQueryWrapper.lambda().eq(TBExamCourse::getSchoolId, SystemConstant.convertIdToLong(schoolId));
         tbExamCourseQueryWrapper.lambda().eq(TBExamCourse::getExamId, SystemConstant.convertIdToLong(examId));
         return ResultUtil.ok(tbExamCourseService.list(tbExamCourseQueryWrapper));
     }
@@ -87,32 +89,36 @@ public class SysReportController {
     @ApiOperation(value = "开课学院列表")
     @RequestMapping(value = "/common/list_teach_college", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
-    public Result listTeachCollege(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+    public Result listTeachCollege(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                                   @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                    @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(tbExamStudentService.selectTeachCollegeList(SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(tbExamStudentService.selectTeachCollegeList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
     }
 
     @ApiOperation(value = "考察学院列表")
     @RequestMapping(value = "/common/list_inspect_college", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
-    public Result listInspectCollege(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+    public Result listInspectCollege(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                                     @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                      @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(tbExamStudentService.selectInspectCollegeList(SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(tbExamStudentService.selectInspectCollegeList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
     }
 
     @ApiOperation(value = "教师列表")
     @RequestMapping(value = "/common/list_teacher", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
-    public Result listTeacher(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+    public Result listTeacher(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                              @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                               @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(tbExamStudentService.selectTeachList(SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(tbExamStudentService.selectTeachList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
     }
 
     @ApiOperation(value = "班级列表")
     @RequestMapping(value = "/common/list_class", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
-    public Result listClass(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+    public Result listClass(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
+                            @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(tbExamStudentService.selectClassList(SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(tbExamStudentService.selectClassList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
     }
 }

teachcloud-report/src/main/resources/application.properties

@@ -16,6 +16,7 @@ prefix.url.exam=admin/exam
 prefix.url.data=admin/data
 prefix.url.reportWuda=report/wuda/open
 prefix.url.reportSchool=report/school
+prefix.url.reportCourse=report/course
 
 #\u65E5\u5FD7\u914D\u7F6E
 com.qmth.logging.root-level=info