学期枚举修改为学期id

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

@@ -1,13 +1,10 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
-import java.util.Objects;
 
 /**
  * @Date: 2021/6/9.
@@ -73,11 +70,7 @@ public class ExamInfo {
     }
 
     public String getSemester() {
-        if (Objects.nonNull(semester)) {
-            return SemesterEnum.valueOf(semester).getTitle();
-        } else {
-            return null;
-        }
+        return semester;
     }
 
     public void setSemester(String semester) {

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

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.Objects;
@@ -58,11 +57,7 @@ public class InspectCollegeResult {
     }
 
     public String getSemester() {
-        if (Objects.nonNull(semester)) {
-            return SemesterEnum.valueOf(semester).getTitle();
-        } else {
-            return semester;
-        }
+        return semester;
     }
 
     public void setSemester(String semester) {

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

@@ -2,11 +2,9 @@ package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.qmth.teachcloud.report.business.entity.TBExam;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.util.Objects;
 
 /**
  * @Description: TBExamResult

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

@@ -2,7 +2,6 @@ package com.qmth.teachcloud.report.business.bean.result;
 
 import com.qmth.teachcloud.common.annotation.ExcelProperty;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.math.BigDecimal;
@@ -59,11 +58,7 @@ public class TeachCollegeResult {
     private String teacherName;
 
     public String getSemester() {
-        if (Objects.nonNull(semester)) {
-            return SemesterEnum.valueOf(semester).getTitle();
-        } else {
-            return semester;
-        }
+        return semester;
     }
 
     public void setSemester(String semester) {

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

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.qmth.teachcloud.common.base.BaseEntity;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/enums/SemesterEnum.java

@@ -1,44 +0,0 @@
-package com.qmth.teachcloud.report.business.enums;
-
-import java.util.Objects;
-
-/**
- * @Description: 学期enum
- * @Param:
- * @return:
- * @Author: wangliang
- * @Date: 2021/6/7
- */
-public enum SemesterEnum {
-
-    FIRST("2020-2021学年度第1学期"),
-
-    SECOND("2020-2021学年度第2学期"),
-
-    THIRD("2021-2022学年度第1学期");
-
-    private String title;
-
-    private SemesterEnum(String title) {
-        this.title = title;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 状态转换 toName
-     *
-     * @param title
-     * @return
-     */
-    public static String convertToName(String title) {
-        for (SemesterEnum e : SemesterEnum.values()) {
-            if (Objects.equals(title, e.getTitle())) {
-                return e.name();
-            }
-        }
-        return null;
-    }
-}

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

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseCollegeInspectResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeInspect;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -41,11 +40,11 @@ public interface TAExamCourseCollegeInspectMapper extends BaseMapper<TAExamCours
      * 我的课堂考试分析-考试概况，查找全校数据
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @return
      */
-    TAExamCourseCollegeInspectResult findTeacherInspect(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId);
+    TAExamCourseCollegeInspectResult findTeacherInspect(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId);
 }

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

@@ -8,7 +8,6 @@ import com.qmth.teachcloud.report.business.bean.result.TAExamCourseTeacherResult
 import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
-import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -23,11 +22,11 @@ import java.util.List;
  */
 public interface TAExamCourseCollegeTeacherMapper extends BaseMapper<TAExamCourseCollegeTeacher> {
 
-    IPage<TeacherClassRankResult> listClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
+    IPage<TeacherClassRankResult> listClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
-    IPage<TeacherMyClassRankResult> listMyClassRank(@Param("page") Page<TeacherMyClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("teacherId") Long teacherId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("column") String column, @Param("order") String order);
+    IPage<TeacherMyClassRankResult> listMyClassRank(@Param("page") Page<TeacherMyClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("teacherId") Long teacherId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("column") String column, @Param("order") String order);
 
-    IPage<TeacherClassRankResult> listAllTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("inspectCollegeId") Long inspectCollegeId, @Param("courseCode") String courseCode, @Param("teacherId") Long teacherId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
+    IPage<TeacherClassRankResult> listAllTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("inspectCollegeId") Long inspectCollegeId, @Param("courseCode") String courseCode, @Param("teacherId") Long teacherId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
     /**
      * 查询老师得分
@@ -39,7 +38,7 @@ public interface TAExamCourseCollegeTeacherMapper extends BaseMapper<TAExamCours
      */
     List<TAExamCourseTeacherResult> findTeacherInfo(@Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("collegeId") Long collegeId);
 
-    IPage<TeacherClassRankResult> listTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("column") String column, @Param("order") String order);
+    IPage<TeacherClassRankResult> listTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("column") String column, @Param("order") String order);
 
     /**
      * 我的课堂考试分析图表接口

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

@@ -5,9 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qmth.teachcloud.report.business.bean.result.ExamCourseResult;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseCollegeTeacherResult;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult;
-import com.qmth.teachcloud.report.business.bean.result.TeachCourseSurveyResult;
 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;
@@ -34,9 +32,9 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
      * @param order
      * @return
      */
-    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId, @Param("collegeId") Long collegeId, @Param("column") String column, @Param("order") String order);
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semesterId") Long semesterId, @Param("schoolId") Long schoolId, @Param("collegeId") Long collegeId, @Param("column") String column, @Param("order") String order);
 
-    ExamCourseResult getOverview(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    ExamCourseResult getOverview(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**
      * 赋分管理列表接口
@@ -54,7 +52,7 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
     IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("examId") Long examId,
                                                  @Param("courseCode") String courseCode,
                                                  @Param("publishStatus") String publishStatus,
-                                                 @Param("semester") String semester,
+                                                 @Param("semesterId") Long semesterId,
                                                  @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
     Map<String, String> getScoreAndRate(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
@@ -71,5 +69,5 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
      * @param order
      * @return
      */
-    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("column") String column, @Param("order") String order);
+    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("column") String column, @Param("order") String order);
 }

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

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -18,7 +17,7 @@ import java.util.List;
  */
 public interface TAExamCourseRecordMapper extends BaseMapper<TAExamCourseRecord> {
 
-    List<TAExamCourseRecord> listExamCourseRecord(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    List<TAExamCourseRecord> listExamCourseRecord(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     ExamStudentResult getStudent(@Param("schoolId") Long schoolId, @Param("examId") String examId, @Param("studentCode") String studentCode, @Param("courseCode") String courseCode);
 
@@ -48,12 +47,12 @@ public interface TAExamCourseRecordMapper extends BaseMapper<TAExamCourseRecord>
      * 我的课堂考试分析-考试概况，查找我的课堂数据
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @param teacherId
      * @return
      */
-    List<TeachCourseResult> findTeacherInspect(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId);
+    List<TeachCourseResult> findTeacherInspect(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId);
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamTotal;
-import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -20,7 +19,7 @@ import java.util.List;
  */
 public interface TAExamTotalMapper extends BaseMapper<TAExamTotal> {
 
-    TAExamTotal getOverview(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId);
+    TAExamTotal getOverview(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId);
 
-    IPage<TAExamCourse> getCourseSummary(@Param("page") Page<TAExamCourse> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
+    IPage<TAExamCourse> getCourseSummary(@Param("page") Page<TAExamCourse> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 }

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

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TBExamStudent;
-import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
@@ -96,7 +94,7 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      *
      * @param page
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param current
@@ -106,16 +104,16 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param collegeIds
      * @return
      */
-    IPage<TeachCollegeResult> listTeachCollegeResult(@Param("page") Page<TeachCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
+    IPage<TeachCollegeResult> listTeachCollegeResult(@Param("page") Page<TeachCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teachCollegeId") Long teachCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
-    List<TeachCollegeResult> listTeachCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
+    List<TeachCollegeResult> listTeachCollegeResult(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("studentParam") String studentParam, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
     /**
      * 考查成绩查询
      *
      * @param page
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param current
@@ -124,9 +122,9 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param studentParam
      * @return
      */
-    IPage<InspectCollegeResult> listInspectCollegeResult(@Param("page") Page<InspectCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("clazzId") Long clazzId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
+    IPage<InspectCollegeResult> listInspectCollegeResult(@Param("page") Page<InspectCollegeResult> page, @Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("clazzId") Long clazzId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
 
-    List<InspectCollegeResult> listInspectCollegeResult(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("clazzId") Long clazzId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
+    List<InspectCollegeResult> listInspectCollegeResult(@Param("schoolId") Long schoolId, @Param("semesterId") Long semesterId, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("current") Boolean current, @Param("inspectCollegeId") Long inspectCollegeId, @Param("teacherId") Long teacherId, @Param("clazzId") Long clazzId, @Param("studentParam") String studentParam, @Param("column") String column, @Param("order") String order);
 
     /**
      * 学生报告预览-列表接口

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

@@ -1,7 +1,6 @@
 package com.qmth.teachcloud.report.business.service;
 
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 /**
  * @Description: 考查课程考试总览
@@ -10,6 +9,6 @@ import com.qmth.teachcloud.report.business.enums.SemesterEnum;
  */
 public interface CourseReportService {
 
-    InspectCourseTotalReportResult findInfoInspectCourseExamTotal(Long schoolId, SemesterEnum semester, Long examId,Long collegeId);
+    InspectCourseTotalReportResult findInfoInspectCourseExamTotal(Long schoolId, Long semesterId, Long examId,Long collegeId);
 
 }

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

@@ -4,11 +4,9 @@ import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.TBSession;
 import com.qmth.teachcloud.common.enums.UploadFileEnum;
 import com.qmth.teachcloud.report.business.bean.result.*;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.IOException;
-import java.security.NoSuchAlgorithmException;
 import java.util.List;
 
 /**
@@ -121,12 +119,12 @@ public interface ReportCommonService {
     /**
      * 获取开课课程考试课程总览
      *
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @return
      */
-    TeachCourseSurveyResult getTeachCourseSurveyInfo(SemesterEnum semester, Long examId, String courseCode);
+    TeachCourseSurveyResult getTeachCourseSurveyInfo(Long semesterId, Long examId, String courseCode);
 
     /**
      * 保存附件

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

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.business.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseCollegeInspectResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeInspect;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 import java.util.List;
 
@@ -40,11 +39,11 @@ public interface TAExamCourseCollegeInspectService extends IService<TAExamCourse
      * 我的课堂考试分析-考试概况，查找全校数据
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @return
      */
-    TAExamCourseCollegeInspectResult findTeacherInspect(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId);
+    TAExamCourseCollegeInspectResult findTeacherInspect(Long schoolId, Long semesterId, Long examId, String courseCode, Long inspectCollegeId);
 }

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

@@ -5,7 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 import java.util.List;
 
@@ -19,11 +18,11 @@ import java.util.List;
  */
 public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourseCollegeTeacher> {
 
-    IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<TeacherClassRankResult> listClassRank(Long semesterId, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
-    IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<TeacherMyClassRankResult> listMyClassRank(Long semesterId, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
-    IPage<TeacherClassRankResult> listAllTeacherClassRank(SemesterEnum semester, Long examId, Long inspectCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<TeacherClassRankResult> listAllTeacherClassRank(Long semesterId, Long examId, Long inspectCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
      * 查询老师得分
@@ -35,42 +34,42 @@ public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourse
      */
     List<TAExamCourseTeacherResult> findTeacherInfo(Long examId, String courseCode, Long collegeId);
 
-    IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<TeacherClassRankResult> listTeacherClassRank(Long semesterId, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
      * 我的课堂考试分析-图表接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @return
      */
-    SurveyTeacherViewResult teacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId);
+    SurveyTeacherViewResult teacherView(Long schoolId, Long semesterId, Long examId, String courseCode, Long inspectCollegeId);
 
     /**
      * 我的课堂考试分析-试题难度得分情况分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @param teacherId
      * @return
      */
-    DimensionAnalyzeResult teacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId,Long teacherId);
+    DimensionAnalyzeResult teacherQuestionView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId,Long teacherId);
 
     /**
      * 我的课堂考试分析-各难度水平题目上的作答分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
-    QuestionInfoResult teacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId,Long teacher);
+    QuestionInfoResult teacherQuestionAnswerView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId,Long teacher);
 }

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

@@ -5,7 +5,6 @@ import com.qmth.teachcloud.report.business.bean.result.ExamRecordResult;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherDistributionResult;
 import com.qmth.teachcloud.report.business.bean.result.TeachCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 import java.util.List;
 
@@ -43,12 +42,12 @@ public interface TAExamCourseRecordService extends IService<TAExamCourseRecord>
      * 我的课堂考试分析-考试概况，查找我的课堂数据
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @param teacherId
      * @return
      */
-    List<TeachCourseResult> findTeacherInspect(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Long teacherId);
+    List<TeachCourseResult> findTeacherInspect(Long schoolId, Long semesterId, Long examId, String courseCode, Long inspectCollegeId, Long teacherId);
 }

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

@@ -6,9 +6,7 @@ import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
-import java.math.BigDecimal;
 import java.util.Map;
 
 /**
@@ -26,16 +24,16 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      *
      * @param iPage
      * @param examId
-     * @param semester
+     * @param semesterId
      * @param schoolId
      * @param column
      * @param order
      * @return
      */
-    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId, String column, OrderEnum order);
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, Long semesterId, Long schoolId, String column, OrderEnum order);
 
 
-    ExamCourseResult getOverview(SemesterEnum semester, Long examId, String courseCode);
+    ExamCourseResult getOverview(Long semesterId, Long examId, String courseCode);
 
     /**
      * 赋分管理列表接口
@@ -45,78 +43,78 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param examId
      * @param courseCode
      * @param publishStatus
-     * @param semester
+     * @param semesterId
      * @param column
      * @param order
      * @return
      */
-    IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester, String column, OrderEnum order);
+    IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, Long semesterId, String column, OrderEnum order);
 
-    GradeDistributeFinalResult getGradeDistribute(SemesterEnum semester, Long examId, String courseCode);
+    GradeDistributeFinalResult getGradeDistribute(Long semesterId, Long examId, String courseCode);
 
     /**
      * 考查课程考试分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
-    CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId);
+    CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId);
 
     /**
      * 开课课程考试总览图表接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
-    SurveyTeacherViewResult surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId);
+    SurveyTeacherViewResult surveyTeacherView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId);
 
     /**
      * 开课课程考试总览-教师各课堂成绩排名接口
      *
      * @param iPage
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param column
      * @param order
      * @return
      */
-    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode, String column, OrderEnum order);
+    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, Long semesterId, Long examId, String courseCode, String column, OrderEnum order);
 
     /**
      * 开课课程考试总览-试题难度得分情况分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @param teacherId
      * @return
      */
-    DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
+    DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId, Long teacherId);
 
     /**
      * 开课课程考试总览-各难度水平题目上的作答分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @param teacherId
      * @return
      */
-    QuestionInfoResult surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId);
+    QuestionInfoResult surveyTeacherQuestionAnswerView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId, Long teacherId);
 
     /**
      * 赋分试算
@@ -132,9 +130,9 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * 导出课程分析接口
      *
      * @param examId
-     * @param semester
+     * @param semesterId
      * @param schoolId
      * @param courseCode
      */
-    void courseExport(Long examId, SemesterEnum semester, Long schoolId, String courseCode) throws Exception;
+    void courseExport(Long examId, Long semesterId, Long schoolId, String courseCode) throws Exception;
 }

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

@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamTotal;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
-
-import javax.servlet.http.HttpServletResponse;
 
 /**
  * <p>
@@ -19,11 +16,11 @@ import javax.servlet.http.HttpServletResponse;
  */
 public interface TAExamTotalService extends IService<TAExamTotal> {
 
-    TAExamTotal getOverview(SemesterEnum semester, Long examId);
+    TAExamTotal getOverview(Long semesterId, Long examId);
 
-    IPage<TAExamCourse> getCourseSummary(SemesterEnum semester, Long examId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<TAExamCourse> getCourseSummary(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
-    void exportCourseSummary(SemesterEnum semester, Long examId, String column, OrderEnum order) throws Exception;
+    void exportCourseSummary(Long semesterId, Long examId, String column, OrderEnum order) throws Exception;
 
-    void exportDataAnalysis(SemesterEnum semester, Long examId, String courseCode) throws Exception;
+    void exportDataAnalysis(Long semesterId, Long examId, String courseCode) throws Exception;
 }

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

@@ -6,10 +6,8 @@ import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TBExamStudent;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
@@ -83,7 +81,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
     /**
      * 开课成绩查询
      *
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param current
@@ -96,7 +94,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @return
      */
-    IPage<TeachCollegeResult> listTeachCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<TeachCollegeResult> listTeachCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
      * 导入异常考试类型
@@ -111,7 +109,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
     /**
      * 开课成绩查询-导出查询结果
      *
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param current
@@ -122,12 +120,12 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @throws Exception
      */
-    void exportTeachCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
+    void exportTeachCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
 
     /**
      * 考查成绩查询
      *
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param current
@@ -140,12 +138,12 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @return
      */
-    IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, Long clazzId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<InspectCollegeResult> listInspectCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, Long clazzId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
      * 考查成绩查询-导出查询结果
      *
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param current
@@ -155,7 +153,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param column
      * @param order
      */
-    void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, Long clazzId, String studentParam, String column, OrderEnum order) throws Exception;
+    void exportInspectCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, Long clazzId, String studentParam, String column, OrderEnum order) throws Exception;
 
     /**
      * 学生报告预览-列表接口

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

@@ -1,11 +1,7 @@
 package com.qmth.teachcloud.report.business.service.impl;
 
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.SysUser;
-import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
-import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.*;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.CourseReportMapper;
 import com.qmth.teachcloud.report.business.service.CourseReportService;
 import org.springframework.cache.annotation.Cacheable;
@@ -28,8 +24,8 @@ public class CourseReportServiceImpl implements CourseReportService {
     private CourseReportMapper courseReportMapper;
 
     @Override
-    @Cacheable(value = SystemConstant.COLLEGE_DEAN_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' +#collegeId")
-    public InspectCourseTotalReportResult findInfoInspectCourseExamTotal(Long schoolId, SemesterEnum semester, Long examId, Long collegeId) {
+    @Cacheable(value = SystemConstant.COLLEGE_DEAN_REPORT, key = "#schoolId + '-' + #semesterId + '-' + #examId + '-' +#collegeId")
+    public InspectCourseTotalReportResult findInfoInspectCourseExamTotal(Long schoolId, Long semesterId, Long examId, Long collegeId) {
 
         // 考试总览数据
         List<ExamBaseInfo> examBaseInfoList = courseReportMapper.findExamTotalByExamId(examId);

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

@@ -675,13 +675,13 @@ public class ReportCommonServiceImpl implements ReportCommonService {
     /**
      * 获取开课课程考试课程总览
      *
-     * @param semester   semester
+     * @param semesterId   semesterId
      * @param examId     examId
      * @param courseCode courseCode
      * @return return
      */
     @Override
-    public TeachCourseSurveyResult getTeachCourseSurveyInfo(SemesterEnum semester, Long examId, String courseCode) {
+    public TeachCourseSurveyResult getTeachCourseSurveyInfo(Long semesterId, Long examId, String courseCode) {
         TBExam tbExam = tbExamService.getById(examId);
         TAExamCourse taExamCourse = taExamCourseService.getOne(new QueryWrapper<TAExamCourse>().lambda().eq(TAExamCourse::getExamId, examId).eq(TAExamCourse::getCourseCode, courseCode));
         TeachCourseSurveyResult teachCourseSurveyResult = new TeachCourseSurveyResult();

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

@@ -3,14 +3,12 @@ package com.qmth.teachcloud.report.business.service.impl;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.qmth.teachcloud.report.business.bean.result.TAExamCourseCollegeInspectResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeInspect;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseCollegeInspectMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeInspectService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * <p>
@@ -55,14 +53,14 @@ public class TAExamCourseCollegeInspectServiceImpl extends ServiceImpl<TAExamCou
      * 我的课堂考试分析-考试概况，查找全校数据
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @return
      */
     @Override
-    public TAExamCourseCollegeInspectResult findTeacherInspect(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId) {
-        return taExamCourseCollegeInspectMapper.findTeacherInspect(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId);
+    public TAExamCourseCollegeInspectResult findTeacherInspect(Long schoolId, Long semesterId, Long examId, String courseCode, Long inspectCollegeId) {
+        return taExamCourseCollegeInspectMapper.findTeacherInspect(schoolId, semesterId, examId, courseCode, inspectCollegeId);
     }
 }

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

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.business.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.google.gson.Gson;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.service.SysOrgService;
@@ -11,7 +10,6 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseCollegeTeacherMapper;
 import com.qmth.teachcloud.report.business.service.ReportCommonService;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeInspectService;
@@ -51,36 +49,36 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     TAExamCourseRecordService taExamCourseRecordService;
 
     @Override
-    public IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<TeacherClassRankResult> listClassRank(Long semesterId, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, semesterId, examId, courseCode, inspectCollegeId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, semesterId, examId, courseCode, inspectCollegeId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
     }
 
     @Override
-    public IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<TeacherMyClassRankResult> listMyClassRank(Long semesterId, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<TeacherMyClassRankResult> page = new Page<>(pageNumber, pageSize);
-        return taExamCourseCollegeTeacherMapper.listMyClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
+        return taExamCourseCollegeTeacherMapper.listMyClassRank(page, schoolId, semesterId, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override
-    public IPage<TeacherClassRankResult> listAllTeacherClassRank(SemesterEnum semester, Long examId, Long teachCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<TeacherClassRankResult> listAllTeacherClassRank(Long semesterId, Long examId, Long teachCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return taExamCourseCollegeTeacherMapper.listAllTeacherClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, teachCollegeId, courseCode, teacherId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamCourseCollegeTeacherMapper.listAllTeacherClassRank(page, schoolId, semesterId, examId, teachCollegeId, courseCode, teacherId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return taExamCourseCollegeTeacherMapper.listAllTeacherClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, teachCollegeId, courseCode, teacherId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamCourseCollegeTeacherMapper.listAllTeacherClassRank(page, schoolId, semesterId, examId, teachCollegeId, courseCode, teacherId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
     }
 
@@ -98,37 +96,37 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     }
 
     @Override
-    public IPage<TeacherClassRankResult> listTeacherClassRank(SemesterEnum semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<TeacherClassRankResult> listTeacherClassRank(Long semesterId, Long examId, String courseCode, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
-        return taExamCourseCollegeTeacherMapper.listTeacherClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, column, Objects.nonNull(order) ? order.name() : null);
+        return taExamCourseCollegeTeacherMapper.listTeacherClassRank(page, schoolId, semesterId, examId, courseCode, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     /**
      * 我的课堂考试分析-图表接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
      * @return
      */
     @Override
-    public SurveyTeacherViewResult teacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId) {
+    public SurveyTeacherViewResult teacherView(Long schoolId, Long semesterId, Long examId, String courseCode, Long inspectCollegeId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
         // 考试概况
-        TAExamCourseCollegeInspectResult taExamCourseCollegeInspectResult = taExamCourseCollegeInspectService.findTeacherInspect(sysUser.getSchoolId(), semester, examId, courseCode, inspectCollegeId);
+        TAExamCourseCollegeInspectResult taExamCourseCollegeInspectResult = taExamCourseCollegeInspectService.findTeacherInspect(sysUser.getSchoolId(), semesterId, examId, courseCode, inspectCollegeId);
         TeachCourseResult teachCourseResultFinal = null;
         if (Objects.nonNull(taExamCourseCollegeInspectResult)) {
             teachCourseResultFinal = new TeachCourseResult(taExamCourseCollegeInspectResult);
         } else {
             teachCourseResultFinal = new TeachCourseResult();
         }
-        List<TeachCourseResult> teachCourseResultList = taExamCourseRecordService.findTeacherInspect(sysUser.getSchoolId(), semester, examId, courseCode, inspectCollegeId, sysUser.getId());
+        List<TeachCourseResult> teachCourseResultList = taExamCourseRecordService.findTeacherInspect(sysUser.getSchoolId(), semesterId, examId, courseCode, inspectCollegeId, sysUser.getId());
         if (Objects.nonNull(teachCourseResultList) && teachCourseResultList.size() > 0) {
             for (TeachCourseResult t : teachCourseResultList) {
                 if (t.getAbsent()) {
@@ -143,7 +141,7 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
         //学院学科报表科目描述
         List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, inspectCollegeId, false);
         //查找题目信息(该教师在该学院下的数据)
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, null,inspectCollegeId,sysUser.getId());
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, null, inspectCollegeId, sysUser.getId());
         return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, teachCourseResultFinal, questionListResult, surveyTeacherExamCourseResult);
     }
 
@@ -151,14 +149,14 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
      * 我的课堂考试分析-试题难度得分情况分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
     @Override
-    public DimensionAnalyzeResult teacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
+    public DimensionAnalyzeResult teacherQuestionView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId, Long teacherId) {
         return reportCommonService.findDimensionInfo(examId, courseCode, collegeId, teacherId);
     }
 
@@ -166,14 +164,14 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
      * 我的课堂考试分析-各难度水平题目上的作答分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
     @Override
-    public QuestionInfoResult teacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
+    public QuestionInfoResult teacherQuestionAnswerView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId, Long teacherId) {
         return reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, teacherId);
     }
 }

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

@@ -5,14 +5,12 @@ import com.qmth.teachcloud.report.business.bean.result.ExamRecordResult;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherDistributionResult;
 import com.qmth.teachcloud.report.business.bean.result.TeachCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseRecordMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseRecordService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * <p>
@@ -58,7 +56,7 @@ public class TAExamCourseRecordServiceImpl extends ServiceImpl<TAExamCourseRecor
      * 我的课堂考试分析-考试概况，查找我的课堂数据
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param inspectCollegeId
@@ -66,7 +64,7 @@ public class TAExamCourseRecordServiceImpl extends ServiceImpl<TAExamCourseRecor
      * @return
      */
     @Override
-    public List<TeachCourseResult> findTeacherInspect(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Long teacherId) {
-        return taExamCourseRecordMapper.findTeacherInspect(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, teacherId);
+    public List<TeachCourseResult> findTeacherInspect(Long schoolId, Long semesterId, Long examId, String courseCode, Long inspectCollegeId, Long teacherId) {
+        return taExamCourseRecordMapper.findTeacherInspect(schoolId, semesterId, examId, courseCode, inspectCollegeId, teacherId);
     }
 }

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

@@ -12,11 +12,9 @@ import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
-import com.qmth.teachcloud.report.business.entity.TBExam;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseMapper;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseRecordMapper;
 import com.qmth.teachcloud.report.business.service.*;
@@ -71,24 +69,24 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      *
      * @param iPage
      * @param examId
-     * @param semester
+     * @param semesterId
      * @param schoolId
      * @param column
      * @param order
      * @return
      */
     @Override
-    public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId, String column, OrderEnum order) {
+    public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, Long semesterId, Long schoolId, String column, OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long collegeId = sysUser.getOrgId();
-        return taExamCourseMapper.surveyTeacherList(iPage, examId, Objects.nonNull(semester) ? semester.name() : null, schoolId, collegeId, column, Objects.nonNull(order) ? order.name() : null);
+        return taExamCourseMapper.surveyTeacherList(iPage, examId, semesterId, schoolId, collegeId, column, Objects.nonNull(order) ? order.name() : null);
     }
 
 
     @Override
-    public ExamCourseResult getOverview(SemesterEnum semester, Long examId, String courseCode) {
+    public ExamCourseResult getOverview(Long semesterId, Long examId, String courseCode) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return taExamCourseMapper.getOverview(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode);
+        return taExamCourseMapper.getOverview(schoolId, semesterId, examId, courseCode);
     }
 
     /**
@@ -99,24 +97,24 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param examId
      * @param courseCode
      * @param publishStatus
-     * @param semester
+     * @param semesterId
      * @param column
      * @param order
      * @return
      */
     @Override
-    public IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester, String column, OrderEnum order) {
+    public IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, Long semesterId, String column, OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, semesterId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, semesterId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
     }
 
     @Override
-    public GradeDistributeFinalResult getGradeDistribute(SemesterEnum semester, Long examId, String courseCode) {
+    public GradeDistributeFinalResult getGradeDistribute(Long semesterId, Long examId, String courseCode) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         //取总体和应届平均分
@@ -141,15 +139,15 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * 考查课程考试分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
     @Override
-    @Cacheable(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
-    public CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId) {
+    @Cacheable(value = SystemConstant.COLLEGE_COURSE_REPORT, key = "#schoolId + '-' + #semesterId + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
+    public CollegeAndCourseResult surveyInspectAnalyseView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId) {
         //学院学科报表查询科目信息
         CourseInfoResult courseInfoResult = reportCommonService.findCourseInfo(examId, courseCode, collegeId);
         //学院学科报表科目描述
@@ -161,7 +159,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         //查找老师得分
         TeacherInfoListResult teacherInfoListResult = reportCommonService.findTeacherInfo(examId, courseCode, collegeId);
         //查找题目信息
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, null,null,null);
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, null, null, null);
 
         return new CollegeAndCourseResult(courseInfoResult, collegeAndSchoolGradeDistributionResult, dimensionAnalyzeResult,
                 questionInfoResult, teacherInfoListResult, questionListResult);
@@ -171,17 +169,17 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * 开课课程考试总览图表接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
      * @return
      */
     @Override
-    @Cacheable(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
-    public SurveyTeacherViewResult surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId) {
+    @Cacheable(value = SystemConstant.SURVEY_TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semesterId + '-' + #examId + '-' + #courseCode + '-' + #collegeId")
+    public SurveyTeacherViewResult surveyTeacherView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId) {
         // 考试概况
-        TeachCourseSurveyResult teachCourseSurveyResult = reportCommonService.getTeachCourseSurveyInfo(semester, examId, courseCode);
+        TeachCourseSurveyResult teachCourseSurveyResult = reportCommonService.getTeachCourseSurveyInfo(semesterId, examId, courseCode);
 
         //取总体和应届平均分
         SurveyTeacherExamCourseResult surveyTeacherExamCourseResult = reportCommonService.findAvgScore(schoolId, courseCode, examId, false);
@@ -189,7 +187,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         //学院学科报表科目描述
         List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, null, false);
         //查找题目信息
-        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, null,null,null);
+        QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, null, null, null);
         return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, questionListResult, surveyTeacherExamCourseResult, teachCourseSurveyResult);
     }
 
@@ -198,7 +196,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      *
      * @param iPage
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param column
@@ -206,15 +204,15 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @return
      */
     @Override
-    public IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode, String column, OrderEnum order) {
-        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, column, Objects.nonNull(order) ? order.name() : null);
+    public IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, Long semesterId, Long examId, String courseCode, String column, OrderEnum order) {
+        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, semesterId, examId, courseCode, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     /**
      * 开课课程考试总览-试题难度得分情况分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
@@ -223,7 +221,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      */
     @Override
 //    @Cacheable(value = SystemConstant.TEACHER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId + '-' + #teacherId")
-    public DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
+    public DimensionAnalyzeResult surveyTeacherQuestionView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId, Long teacherId) {
         return reportCommonService.findDimensionInfo(examId, courseCode, collegeId, teacherId);
     }
 
@@ -231,7 +229,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * 开课课程考试总览-各难度水平题目上的作答分析接口
      *
      * @param schoolId
-     * @param semester
+     * @param semesterId
      * @param examId
      * @param courseCode
      * @param collegeId
@@ -240,7 +238,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      */
     @Override
 //    @Cacheable(value = SystemConstant.TEACHER_ANSWER_VIEW_REPORT, key = "#schoolId + '-' + #semester + '-' + #examId + '-' + #courseCode + '-' + #collegeId + '-' + #teacherId")
-    public QuestionInfoResult surveyTeacherQuestionAnswerView(Long schoolId, SemesterEnum semester, Long examId, String courseCode, Long collegeId, Long teacherId) {
+    public QuestionInfoResult surveyTeacherQuestionAnswerView(Long schoolId, Long semesterId, Long examId, String courseCode, Long collegeId, Long teacherId) {
         return reportCommonService.findSituationOfQuestions(examId, courseCode, collegeId, teacherId);
     }
 
@@ -355,18 +353,18 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * 导出课程分析接口
      *
      * @param examId
-     * @param semester
+     * @param semesterId
      * @param schoolId
      * @param courseCode
      */
     @Override
-    public void courseExport(Long examId, SemesterEnum semester, Long schoolId, String courseCode) throws Exception {
+    public void courseExport(Long examId, Long semesterId, Long schoolId, String courseCode) throws Exception {
         //成绩对比明细
-        IPage<TeachCollegeResult> teachCollegeResultIPage = tbExamStudentService.listTeachCollegeResult(semester, examId, courseCode, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
+        IPage<TeachCollegeResult> teachCollegeResultIPage = tbExamStudentService.listTeachCollegeResult(semesterId, examId, courseCode, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
         //分数段
-        GradeDistributeFinalResult gradeDistributeFinalResult = taExamCourseService.getGradeDistribute(semester, examId, courseCode);
+        GradeDistributeFinalResult gradeDistributeFinalResult = taExamCourseService.getGradeDistribute(semesterId, examId, courseCode);
         //各课堂应届生成绩
-        IPage<TeacherClassRankResult> teacherClassRankResultIPage = taExamCourseCollegeTeacherService.listAllTeacherClassRank(semester, examId, null, courseCode, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
+        IPage<TeacherClassRankResult> teacherClassRankResultIPage = taExamCourseCollegeTeacherService.listAllTeacherClassRank(semesterId, examId, null, courseCode, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
 
         List<String> sheetList = Arrays.asList("成绩对比明细", "全校卷面分数段", "全校最终分数段(全部)", "全校最终分数段(应届)", "各课堂应届生卷面非零平均成绩及排名");
         List<Class<?>> classList = Arrays.asList(TeachCollegeResult.class, GradeDistributePaperResult.class, GradeDistributeResult.class, GradeDistributeCurrentAssignedResult.class, TeacherClassRankResult.class);

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

@@ -15,14 +15,12 @@ import com.qmth.teachcloud.report.business.bean.dto.excel.TAExamCourseDto;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamTotal;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamTotalMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseService;
 import com.qmth.teachcloud.report.business.service.TAExamTotalService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Objects;
@@ -48,27 +46,27 @@ public class TAExamTotalServiceImpl extends ServiceImpl<TAExamTotalMapper, TAExa
     TAExamCourseService taExamCourseService;
 
     @Override
-    public TAExamTotal getOverview(SemesterEnum semester, Long examId) {
+    public TAExamTotal getOverview(Long semesterId, Long examId) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return taExamTotalMapper.getOverview(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId);
+        return taExamTotalMapper.getOverview(schoolId, semesterId, examId);
     }
 
     @Override
-    public IPage<TAExamCourse> getCourseSummary(SemesterEnum semester, Long examId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<TAExamCourse> getCourseSummary(Long semesterId, Long examId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TAExamCourse> page = new Page<>(pageNumber, pageSize);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return taExamTotalMapper.getCourseSummary(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamTotalMapper.getCourseSummary(page, schoolId, semesterId, examId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return taExamTotalMapper.getCourseSummary(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            return taExamTotalMapper.getCourseSummary(page, schoolId, semesterId, examId, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
     }
 
     @Override
-    public void exportCourseSummary(SemesterEnum semester, Long examId, String column, OrderEnum order) throws Exception {
-        IPage<TAExamCourse> taExamCourseIPage = this.getCourseSummary(semester, examId, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, column, order);
+    public void exportCourseSummary(Long semesterId, Long examId, String column, OrderEnum order) throws Exception {
+        IPage<TAExamCourse> taExamCourseIPage = this.getCourseSummary(semesterId, examId, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, column, order);
         Gson gson = new Gson();
         List<TAExamCourseDto> examStudentCourseDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseIPage.getRecords()), new TypeToken<List<TAExamCourseDto>>() {
         }.getType());
@@ -76,8 +74,8 @@ public class TAExamTotalServiceImpl extends ServiceImpl<TAExamTotalMapper, TAExa
     }
 
     @Override
-    public void exportDataAnalysis(SemesterEnum semester, Long examId, String courseCode) throws Exception {
+    public void exportDataAnalysis(Long semesterId, Long examId, String courseCode) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        taExamCourseService.courseExport(examId, semester, Objects.nonNull(sysUser.getSchoolId()) ? sysUser.getSchoolId() : null, courseCode);
+        taExamCourseService.courseExport(examId, semesterId, Objects.nonNull(sysUser.getSchoolId()) ? sysUser.getSchoolId() : null, courseCode);
     }
 }

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

@@ -11,6 +11,7 @@ import com.qmth.teachcloud.common.bean.auth.AuthBean;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicCourse;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.AssignEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.RoleTypeEnum;
 import com.qmth.teachcloud.common.service.BasicCourseService;
@@ -22,10 +23,8 @@ import com.qmth.teachcloud.common.util.excel.ExcelError;
 import com.qmth.teachcloud.report.business.bean.dto.ExamStudentTypeDto;
 import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.entity.*;
-import com.qmth.teachcloud.common.enums.AssignEnum;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.*;
 import com.qmth.teachcloud.report.business.service.TAExamCourseRecordDioService;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
@@ -171,28 +170,28 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
      * @return
      */
     @Override
-    public List<TBExamStudentResult> selectClassList(Long schoolId, Long examId, Long teacherId, String courseCode,Long inspectCollegeId, Boolean absent, Boolean current, PublishStatusEnum status) {
+    public List<TBExamStudentResult> selectClassList(Long schoolId, Long examId, Long teacherId, String courseCode, Long inspectCollegeId, Boolean absent, Boolean current, PublishStatusEnum status) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> orgIdList = new ArrayList<>();
-        if (inspectCollegeId != null && inspectCollegeId > 0){
+        if (inspectCollegeId != null && inspectCollegeId > 0) {
             orgIdList.add(inspectCollegeId);
-        }else {
+        } else {
             orgIdList = sysOrgService.findCollegeIds(sysUser.getOrgId());
         }
         return tbExamStudentMapper.selectClassList(schoolId, examId, teacherId, courseCode, orgIdList, absent, current, Objects.nonNull(status) ? status.name() : null);
     }
 
     @Override
-    public IPage<TeachCollegeResult> listTeachCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<TeachCollegeResult> listTeachCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long orgId = sysUser.getOrgId();
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         IPage<TeachCollegeResult> listPage;
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
         List<TeachCollegeResult> teachCollegeResultList = listPage.getRecords();
         for (TeachCollegeResult teachCollegeResult : teachCollegeResultList) {
@@ -262,29 +261,29 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     @Override
-    public void exportTeachCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
+    public void exportTeachCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         List<TeachCollegeResult> list = null;
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            list = tbExamStudentMapper.listTeachCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            list = tbExamStudentMapper.listTeachCollegeResult(schoolId, semesterId, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            list = tbExamStudentMapper.listTeachCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
+            list = tbExamStudentMapper.listTeachCollegeResult(schoolId, semesterId, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, Objects.nonNull(sysUser.getOrgId()) ? Arrays.asList(sysUser.getOrgId()) : null, column, Objects.nonNull(order) ? order.name() : null);
         }
         ExcelUtil.excelExport("开课成绩查询", TeachCollegeResult.class, list, ServletUtil.getResponse());
     }
 
     @Override
-    public IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, Long clazzId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<InspectCollegeResult> listInspectCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, Long clazzId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        return tbExamStudentMapper.listInspectCollegeResult(new Page<>(pageNumber, pageSize), schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, clazzId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        return tbExamStudentMapper.listInspectCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semesterId, examId, courseCode, current, inspectCollegeId, teacherId, clazzId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override
-    public void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, Long clazzId, String studentParam, String column, OrderEnum order) throws Exception {
+    public void exportInspectCollegeResult(Long semesterId, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, Long clazzId, String studentParam, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, teachCollegeId, teacherId, clazzId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, semesterId, examId, courseCode, current, teachCollegeId, teacherId, clazzId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
         ExcelUtil.excelExport("考查成绩查询", InspectCollegeResult.class, list, ServletUtil.getResponse());
     }
 
@@ -338,7 +337,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         List<ExamInfo> examInfo = tbExamStudentMapper.listExamBySchoolIdAndStudentCode(schoolId, studentCode);
         if (Objects.isNull(examInfo) || examInfo.size() == 0) {
             examInfo = new ArrayList<>();
-        }else {
+        } else {
             for (ExamInfo info : examInfo) {
                 List<CourseInfo> courseInfos = tbExamStudentMapper.listCourseByExamIdAndStudentCode(schoolId, info.getExamId(), studentCode);
                 info.setCourseInfo(courseInfos);
@@ -368,7 +367,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         if (Objects.isNull(collegeResult)) {
             throw ExceptionResultEnum.ERROR.exception("未找到考生的学院信息");
         }
-        log.info("学院信息耗时 ： {}",System.currentTimeMillis() - s);
+        log.info("学院信息耗时 ： {}", System.currentTimeMillis() - s);
         personalReportResult.setCollege(collegeResult);
         return personalReportResult;
     }
@@ -386,14 +385,14 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         examCourseRecordQueryWrapper.lambda().eq(TAExamCourseRecord::getSchoolId, schoolId).eq(TAExamCourseRecord::getExamId, examId).eq(TAExamCourseRecord::getStudentCode, studentCode).eq(TAExamCourseRecord::getCourseCode, courseCode);
         long s1 = System.currentTimeMillis();
         List<TAExamCourseRecord> examCourseRecords = taExamCourseRecordMapper.selectList(examCourseRecordQueryWrapper);
-        log.info("s1 查询耗时{}",System.currentTimeMillis() - s1);
+        log.info("s1 查询耗时{}", System.currentTimeMillis() - s1);
 
 
         QueryWrapper<TBPaper> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(TBPaper::getExamId, examId).eq(TBPaper::getCourseCode, courseCode);
         long s2 = System.currentTimeMillis();
         List<TBPaper> papers = tbPaperMapper.selectList(queryWrapper);
-        log.info("s2 查询耗时{}",System.currentTimeMillis() - s2);
+        log.info("s2 查询耗时{}", System.currentTimeMillis() - s2);
 
         if (examCourseRecords.size() != 1) {
             throw ExceptionResultEnum.ERROR.exception("获取数据异常，应该有且仅有一条数据");
@@ -412,8 +411,8 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         // 模块
 
         long s3 = System.currentTimeMillis();
-        Set<String> moduleNames = taExamCourseRecordDioService.findDimensionTypesByCourseCode(schoolId,SystemConstant.convertIdToLong(examId),courseCode);
-        log.info("s3查询耗时{}",System.currentTimeMillis() - s3);
+        Set<String> moduleNames = taExamCourseRecordDioService.findDimensionTypesByCourseCode(schoolId, SystemConstant.convertIdToLong(examId), courseCode);
+        log.info("s3查询耗时{}", System.currentTimeMillis() - s3);
 
 
         List<DiagnosisDetailResult> diagnosisDetailResults = new ArrayList<>();
@@ -460,7 +459,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
 
             long s4 = System.currentTimeMillis();
             List<ModuleDetailResult> dios = taExamCourseRecordDioMapper.listDiosBySchoolIdAndExamIdAndCourseCodeAndModuleName(schoolId, examId, courseCode, moduleName, studentCode);
-            log.info("s4耗时{}",System.currentTimeMillis() - s4);
+            log.info("s4耗时{}", System.currentTimeMillis() - s4);
 
             moduleResult.setDios(dios);
             diagnosisDetailResult.setModules(moduleResult);
@@ -472,7 +471,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
 
             long s5 = System.currentTimeMillis();
             List<DimensionDetailResult> subDios = taExamCourseRecordDioMapper.listSubDiosBySchoolIdAndExamIdAndStudentCodeAndCourseCodeAndModuleName(schoolId, examId, studentCode, courseCode, moduleName);
-            log.info("s5耗时{}",System.currentTimeMillis() - s5);
+            log.info("s5耗时{}", System.currentTimeMillis() - s5);
             // 按二级维度code排序
             Collections.sort(subDios, new Comparator<DimensionDetailResult>() {
                 @Override

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

@@ -85,8 +85,8 @@
                 <if test="schoolId != null and schoolId != ''">
                     and tbe.school_id = #{schoolId}
                 </if>
-                <if test="semester != null and semester != ''">
-                    and tbe.semester = #{semester}
+                <if test="semesterId != null and semesterId != ''">
+                    and tbe.semester_id = #{semesterId}
                 </if>
                 <if test="courseCode != null and courseCode != ''">
                     and taecci.course_code = #{courseCode}

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

@@ -19,8 +19,8 @@
             t_b_exam b ON a.exam_id = b.id
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -72,8 +72,8 @@
             and b.school_id = #{schoolId}
             and a.teacher_id = #{teacherId}
             and c.publish_status = 'PUBLISH'
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -117,8 +117,8 @@
             tbec.course_code = a.course_code
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -208,8 +208,8 @@
         tbec.course_code = a.course_code
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}

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

@@ -53,8 +53,8 @@
         <include refid="commonMiddle"/>
         <where>
             <include refid="commonCondition"/>
-            <if test="semester != null and semester != ''">
-                and tbe.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and tbe.semester_id = #{semesterId}
             </if>
             <if test="collegeId != null and collegeId != ''">
                 and taec.teach_college_id = #{collegeId}
@@ -77,8 +77,8 @@
             <if test="courseCode != null and courseCode != ''">
                 and taec.course_code = #{courseCode}
             </if>
-            <if test="semester != null and semester != ''">
-                and tbe.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and tbe.semester_id = #{semesterId}
             </if>
             <if test="publishStatus != null and publishStatus != ''">
                 and tbec.publish_status = #{publishStatus}
@@ -116,8 +116,8 @@
             <if test="schoolId != null">
                 and b.school_id = #{schoolId}
             </if>
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -141,8 +141,8 @@
             t_b_exam b ON a.exam_id = b.id
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}

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

@@ -15,8 +15,8 @@
         t_b_exam b ON a.exam_id = b.id
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                AND b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                AND b.semester_id = #{semesterId}
             </if>
             <if test="examId != null and examId != ''">
                 AND a.exam_id = #{examId}
@@ -173,8 +173,8 @@
             <if test="examId != null and examId != ''">
                 AND taecr.exam_id = #{examId}
             </if>
-            <if test="semester != null and semester != ''">
-                AND tbe.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                AND tbe.semester_id = #{semesterId}
             </if>
             <if test="schoolId != null and schoolId != ''">
                 AND tbe.school_id = #{schoolId}

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

@@ -22,8 +22,8 @@
             t_b_exam b ON a.exam_id = b.id
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -62,8 +62,8 @@
         tbec.course_code = a.course_code
         <where>
             and b.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and b.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and b.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}

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

@@ -130,7 +130,7 @@
     <select id="listTeachCollegeResult"
             resultType="com.qmth.teachcloud.report.business.bean.result.TeachCollegeResult">
         select * from(SELECT
-        d.semester,
+        bs.name as semester,
         d.exam_name examName,
         a.course_code courseCode,
         a.course_name courseName,
@@ -164,11 +164,12 @@
         sys_org g ON a.inspect_college_id = g.id
         LEFT JOIN
         sys_user h ON a.teacher_id = h.id
+        join basic_semester bs on bs.id = d.semester_id
         <where>
             and d.school_id = #{schoolId}
             and a.absent = false
-            <if test="semester != null and semester != ''">
-                and d.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and d.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -213,7 +214,7 @@
     <select id="listInspectCollegeResult"
             resultType="com.qmth.teachcloud.report.business.bean.result.InspectCollegeResult">
         select * from(SELECT
-        d.semester,
+        bs.name as semester,
         d.exam_name examName,
         a.course_code courseCode,
         a.course_name courseName,
@@ -246,10 +247,11 @@
         sys_user h ON a.teacher_id = h.id
         join t_b_exam_course tbec on
             tbec.course_code = a.course_code
+        join basic_semester bs on bs.id = d.semester_id
         <where>
             and d.school_id = #{schoolId}
-            <if test="semester != null and semester != ''">
-                and d.semester = #{semester}
+            <if test="semesterId != null and semesterId != ''">
+                and d.semester_id = #{semesterId}
             </if>
             <if test="examId != null">
                 and a.exam_id = #{examId}
@@ -335,11 +337,12 @@
             b.exam_code examCode,
             b.exam_name examName,
             b.exam_time createTime,
-            b.semester as semester
+            bs.name as semester
         FROM
             t_b_exam_student a
                 LEFT JOIN
             t_b_exam b ON a.exam_id = b.id
+            join basic_semester bs on bs.id = d.semester_id
         <where>
             and b.school_id = #{schoolId}
             and a.student_code = #{studentCode}

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

@@ -9,6 +9,7 @@ import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SpringContextHolder;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
+import com.qmth.teachcloud.common.enums.AssignEnum;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
 import com.qmth.teachcloud.common.enums.TaskTypeEnum;
 import com.qmth.teachcloud.common.service.TBTaskService;
@@ -18,10 +19,8 @@ import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
-import com.qmth.teachcloud.common.enums.AssignEnum;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.*;
 import com.qmth.teachcloud.report.business.templete.execute.AsyncDataCalculateTempleteService;
 import io.swagger.annotations.*;
@@ -65,24 +64,24 @@ public class CourseController {
     @RequestMapping(value = "/survey_teacher/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.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 semesterId,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
                                     @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                     @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), SystemConstant.convertIdToLong(semesterId), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order));
     }
 
     @ApiOperation(value = "开课课程考试总览列表导出接口")
     @RequestMapping(value = "/survey_teacher/export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
     public void export(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                       @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                       @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                        @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                        @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                        @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
-        IPage<TAExamCourseResult> taExamCourseResultIPage = taExamCourseService.surveyTeacherList(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order);
+        IPage<TAExamCourseResult> taExamCourseResultIPage = taExamCourseService.surveyTeacherList(new Page<>(SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE), SystemConstant.convertIdToLong(examId), SystemConstant.convertIdToLong(semesterId), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order);
         Gson gson = new Gson();
         List<TAExamCourseExportDto> taExamCourseExportDtoList = gson.fromJson(JacksonUtil.parseJson(taExamCourseResultIPage.getRecords()), new TypeToken<List<TAExamCourseExportDto>>() {
         }.getType());
@@ -93,69 +92,69 @@ public class CourseController {
     @RequestMapping(value = "/survey_teacher/course_export", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = Result.class)})
     public void courseExport(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                             @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                             @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                              @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                              @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) throws Exception {
-        taExamCourseService.courseExport(SystemConstant.convertIdToLong(examId), semester, Objects.nonNull(schoolId) ? SystemConstant.convertIdToLong(schoolId) : null, courseCode);
+        taExamCourseService.courseExport(SystemConstant.convertIdToLong(examId), SystemConstant.convertIdToLong(semesterId), Objects.nonNull(schoolId) ? SystemConstant.convertIdToLong(schoolId) : null, courseCode);
     }
 
     @ApiOperation(value = "开课课程考试总览-教师各课堂成绩排名接口")
     @RequestMapping(value = "/survey_teacher/teacher_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseCollegeTeacherResult.class)})
     public Result surveyTeacherTeacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                           @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                           @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                            @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                            @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                                            @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
                                            @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                            @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, column, order));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, column, order));
     }
 
     @ApiOperation(value = "开课课程考试总览-试题难度得分情况分析接口")
     @RequestMapping(value = "/survey_teacher/question_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = DimensionAnalyzeResult.class)})
     public Result surveyTeacherQuestionView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                             @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                             @ApiParam(value = "考查学院id", required = false) @RequestParam(required = false) String collegeId,
                                             @ApiParam(value = "任课老师id", required = false) @RequestParam(required = false) String teacherId) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null, Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null, Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
     }
 
     @ApiOperation(value = "开课课程考试总览-各难度水平题目上的作答分析接口")
     @RequestMapping(value = "/survey_teacher/question_answer_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
     public Result surveyTeacherQuestionAnswerView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                                  @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                                  @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                                   @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                                   @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                                   @ApiParam(value = "考查学院id", required = false) @RequestParam(required = false) String collegeId,
                                                   @ApiParam(value = "任课老师id", required = false) @RequestParam(required = false) String teacherId) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null, Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : null, Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
     }
 
     @ApiOperation(value = "开课课程考试总览图表接口")
     @RequestMapping(value = "/survey_teacher/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result surveyTeacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                    @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                    @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, sysUser.getOrgId()));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "考查课程考试总览-公共课概况接口")
     @RequestMapping(value = "/survey_inspect/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = InspectCourseTotalReportResult.class)})
     public Result surveyInspectView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                    @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                    @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId) {
         Object obj = ServletUtil.getRequestHeaderSchoolId();
         Long tmp = SystemConstant.convertIdToLong(String.valueOf(obj));
@@ -167,28 +166,28 @@ public class CourseController {
         if (Objects.isNull(collegeId)) {
             throw ExceptionResultEnum.ERROR.exception("学院id不存在");
         }
-        return ResultUtil.ok(courseReportService.findInfoInspectCourseExamTotal(Objects.isNull(schoolId) ? tmp : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), collegeId));
+        return ResultUtil.ok(courseReportService.findInfoInspectCourseExamTotal(Objects.isNull(schoolId) ? tmp : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), collegeId));
     }
 
     @ApiOperation(value = "考查课程考试分析接口")
     @RequestMapping(value = "/survey_inspect_analyse/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = CollegeAndCourseResult.class)})
     public Result surveyInspectAnalyseView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                           @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                           @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                            @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, sysUser.getOrgId()));
+        return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, sysUser.getOrgId()));
     }
 
     @ApiOperation(value = "赋分管理列表接口")
     @RequestMapping(value = "/survey_aspoints/list", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
     public Result surveyAspointsList(@ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
-                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                     @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                      @ApiParam(value = "考试id", required = true) @RequestParam String examId,
                                      @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
                                      @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
@@ -196,7 +195,7 @@ public class CourseController {
                                      @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
                                      @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                      @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester, column, order));
+        return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, SystemConstant.convertIdToLong(semesterId), column, order));
     }
 
     @ApiOperation(value = "赋分试算接口")
@@ -229,9 +228,9 @@ public class CourseController {
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
             @ApiParam(value = "赋分系数", required = true) @RequestParam String coefficient) {
         List<TBPaper> tbPaperList = tbPaperService.list(new QueryWrapper<TBPaper>().lambda()
-                .eq(TBPaper::getExamId,examId)
-                .eq(TBPaper::getCourseCode,courseCode));
-        if (tbPaperList.size() != 1){
+                .eq(TBPaper::getExamId, examId)
+                .eq(TBPaper::getCourseCode, courseCode));
+        if (tbPaperList.size() != 1) {
             log.error("未找到考试id为 ：" + examId + " 课程编号为 ： " + courseCode + "的试卷结构");
             throw ExceptionResultEnum.ERROR.exception("未找到试卷结构");
         }

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

@@ -5,14 +5,11 @@ 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.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacher;
 import com.qmth.teachcloud.report.business.entity.TAExamTotal;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
 import com.qmth.teachcloud.report.business.service.TAExamCourseService;
-import com.qmth.teachcloud.report.business.service.TAExamCourseTeacherService;
 import com.qmth.teachcloud.report.business.service.TAExamTotalService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -21,9 +18,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.Map;
-import java.util.Objects;
 
 @Api(tags = "数据驾驶舱Controller")
 @RestController
@@ -42,75 +37,75 @@ public class DataDriveController {
     @ApiOperation(value = "全校考试总览-全校考试概况")
     @RequestMapping(value = "/exam/get_overview", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "全校考试总览-全校考试概况", response = TAExamTotal.class)})
-    public Result getOverview(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public Result getOverview(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                               @ApiParam(value = "考试ID", required = true) @RequestParam Long examId) {
-        return ResultUtil.ok(taExamTotalService.getOverview(semester, examId));
+        return ResultUtil.ok(taExamTotalService.getOverview(SystemConstant.convertIdToLong(semesterId), examId));
     }
 
     @ApiOperation(value = "全校考试总览-全校课程考试分析汇总")
     @RequestMapping(value = "/exam/get_course_summary", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "全校考试总览-全校考试概况", response = TAExamCourse.class)})
-    public Result getCourseSummary(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public Result getCourseSummary(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                    @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                    @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
                                    @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
                                    @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                    @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamTotalService.getCourseSummary(semester, examId, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(taExamTotalService.getCourseSummary(SystemConstant.convertIdToLong(semesterId), examId, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "全校考试总览-全校课程考试分析汇总-导出课程分析Excel报表")
     @RequestMapping(value = "/exam/export_course_summary", method = RequestMethod.POST)
-    public void exportCourseSummary(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public void exportCourseSummary(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                     @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                     @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                     @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
-        taExamTotalService.exportCourseSummary(semester, examId, column, order);
+        taExamTotalService.exportCourseSummary(SystemConstant.convertIdToLong(semesterId), examId, column, order);
     }
 
     @ApiOperation(value = "全校课程考试分析-全校考试概况")
     @RequestMapping(value = "/course/get_overview", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "全校考试总览-全校考试概况", response = TAExamCourse.class)})
-    public Result getOverview(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public Result getOverview(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                               @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                               @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(taExamCourseService.getOverview(semester, examId, courseCode));
+        return ResultUtil.ok(taExamCourseService.getOverview(SystemConstant.convertIdToLong(semesterId), examId, courseCode));
     }
 
     @ApiOperation(value = "全校课程考试分析-分数段分布情况")
     @RequestMapping(value = "/course/get_grade_distribute", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "全校课程考试分析-分数段分布情况", response = Map.class)})
-    public Result getGradeDistribute(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public Result getGradeDistribute(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                      @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                      @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(taExamCourseService.getGradeDistribute(semester, examId, courseCode));
+        return ResultUtil.ok(taExamCourseService.getGradeDistribute(SystemConstant.convertIdToLong(semesterId), examId, courseCode));
     }
 
     @ApiOperation(value = "全校课程考试分析-教师各课堂成绩排名")
     @RequestMapping(value = "/course/list_teacher_class_rank", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "全校课程考试分析-教师各课堂成绩排名", response = TAExamCourseTeacher.class)})
-    public Result listTeacherClassRank(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public Result listTeacherClassRank(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                        @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                        @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
                                        @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
                                        @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
                                        @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                        @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.listTeacherClassRank(semester, examId, courseCode, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listTeacherClassRank(SystemConstant.convertIdToLong(semesterId), examId, courseCode, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "全校课程考试分析-考试概况-导出课程分析报表")
     @RequestMapping(value = "/course/export_data_analysis", method = RequestMethod.POST)
-    public void exportDataAnalysis(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public void exportDataAnalysis(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                    @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                    @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode) throws Exception {
-        taExamTotalService.exportDataAnalysis(semester, examId, courseCode);
+        taExamTotalService.exportDataAnalysis(SystemConstant.convertIdToLong(semesterId), examId, courseCode);
     }
 
     @ApiOperation(value = "全校教师各课堂成绩排名")
     @RequestMapping(value = "/teacher/list_all_teacher_class_rank", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "全校课程考试分析-教师各课堂成绩排名", response = TAExamCourseTeacher.class)})
-    public Result listAllTeacherClassRank(@ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+    public Result listAllTeacherClassRank(@ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                           @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
                                           @ApiParam(value = "考查学院ID", required = true) @RequestParam(required = false) Long inspectCollegeId,
                                           @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
@@ -119,6 +114,6 @@ public class DataDriveController {
                                           @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
                                           @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
                                           @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.listAllTeacherClassRank(semester, examId, inspectCollegeId, courseCode, teacherId, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listAllTeacherClassRank(SystemConstant.convertIdToLong(semesterId), examId, inspectCollegeId, courseCode, teacherId, pageNumber, pageSize, column, order));
     }
 }

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

@@ -3,7 +3,6 @@ package com.qmth.teachcloud.report.api;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
-import com.qmth.teachcloud.common.entity.BasicSemester;
 import com.qmth.teachcloud.common.service.BasicSemesterService;
 import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
@@ -12,7 +11,6 @@ import com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult;
 import com.qmth.teachcloud.report.business.entity.TBExam;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TBExamCourseService;
 import com.qmth.teachcloud.report.business.service.TBExamService;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
@@ -66,11 +64,11 @@ public class SysReportController {
     @RequestMapping(value = "/common/list_exam", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试信息", response = TBExamResult.class)})
     public Result listExam(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,
-                           @ApiParam(value = "学期枚举", required = true) @RequestParam SemesterEnum semester) {
+                           @ApiParam(value = "学期id", required = true) @RequestParam String semesterId) {
         QueryWrapper<TBExam> tbExamQueryWrapper = new QueryWrapper<>();
         tbExamQueryWrapper.select(" DISTINCT id,exam_name as examName,exam_code as examCode ")
                 .eq("school_id", SystemConstant.convertIdToLong(schoolId))
-                .eq("semester", semester);
+                .eq("semester_id", SystemConstant.convertIdToLong(semesterId));
         List<TBExam> tbExamList = tbExamService.list(tbExamQueryWrapper);
         List<TBExamResult> tbExamResultList = null;
         if (Objects.nonNull(tbExamList) && tbExamList.size() > 0) {

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

@@ -1,6 +1,5 @@
 package com.qmth.teachcloud.report.api;
 
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.SysUser;
@@ -9,11 +8,9 @@ import com.qmth.teachcloud.common.util.Result;
 import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.result.SurveyTeacherViewResult;
-import com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +41,7 @@ public class TAExamCourseCollegeTeacherController {
     @RequestMapping(value = "/list_class_rank", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "教师各课堂成绩排名", response = TeacherClassRankResult.class)})
     public Result listClassRank(
-            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = false) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考查学院ID", required = false) @RequestParam(required = false) Long inspectCollegeId,
@@ -52,14 +49,14 @@ public class TAExamCourseCollegeTeacherController {
             @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.listClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listClassRank(SystemConstant.convertIdToLong(semesterId), examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "我的课堂考成绩排名")
     @RequestMapping(value = "/list_myclass_rank", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "我的课堂考成绩排名", response = TeacherMyClassRankResult.class)})
     public Result listMyClassRank(
-            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = false) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考查学院ID", required = false) @RequestParam(required = false) Long inspectCollegeId,
@@ -67,25 +64,25 @@ public class TAExamCourseCollegeTeacherController {
             @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.listMyClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listMyClassRank(SystemConstant.convertIdToLong(semesterId), examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "我的课堂考试分析-图表接口")
     @RequestMapping(value = "/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result teacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                              @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                              @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                               @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                               @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                               @ApiParam(value = "考查学院id", required = true) @RequestParam String inspectCollegeId) {
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(inspectCollegeId) ? SystemConstant.convertIdToLong(inspectCollegeId) : null));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(inspectCollegeId) ? SystemConstant.convertIdToLong(inspectCollegeId) : null));
     }
 
     @ApiOperation(value = "我的课堂考试分析-试题难度得分情况分析接口")
     @RequestMapping(value = "/question_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result teacherQuestionView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                      @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                      @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                       @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                       @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                       @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String collegeId) {
@@ -94,14 +91,14 @@ public class TAExamCourseCollegeTeacherController {
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, SystemConstant.convertIdToLong(collegeId),sysUser.getId()));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, SystemConstant.convertIdToLong(collegeId), sysUser.getId()));
     }
 
     @ApiOperation(value = "我的课堂考试分析-各难度水平题目上的作答分析接口")
     @RequestMapping(value = "/question_answer_view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = SurveyTeacherViewResult.class)})
     public Result teacherQuestionAnswerView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
                                             @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                             @ApiParam(value = "学院id", required = false) @RequestParam(required = false) String collegeId) {
@@ -110,6 +107,6 @@ public class TAExamCourseCollegeTeacherController {
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, SystemConstant.convertIdToLong(collegeId),sysUser.getId()));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.teacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(semesterId), SystemConstant.convertIdToLong(examId), courseCode, SystemConstant.convertIdToLong(collegeId), sysUser.getId()));
     }
 }

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

@@ -1,8 +1,8 @@
 package com.qmth.teachcloud.report.api;
 
-
 import com.qmth.boot.api.constant.ApiConstant;
 import com.qmth.boot.api.exception.ApiException;
+import com.qmth.teachcloud.common.contant.SystemConstant;
 import com.qmth.teachcloud.common.entity.BasicAttachment;
 import com.qmth.teachcloud.common.entity.SysUser;
 import com.qmth.teachcloud.common.enums.ExceptionResultEnum;
@@ -13,7 +13,6 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.common.util.ServletUtil;
 import com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult;
 import com.qmth.teachcloud.report.business.enums.OrderEnum;
-import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TBExamStudentService;
 import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +47,7 @@ public class TBExamStudentController {
     @RequestMapping(value = "/list_teach_college_result", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "开课成绩查询信息", response = TBExamStudentResult.class)})
     public Result listTeachCollegeResult(
-            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考试类型", required = true) @RequestParam(required = false) Boolean current,
@@ -59,7 +58,7 @@ public class TBExamStudentController {
             @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
-        return ResultUtil.ok(tbExamStudentService.listTeachCollegeResult(semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(tbExamStudentService.listTeachCollegeResult(SystemConstant.convertIdToLong(semesterId), examId, courseCode, current, inspectCollegeId, teacherId, studentParam, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "开课成绩查询-导入异常考试类型")
@@ -93,7 +92,7 @@ public class TBExamStudentController {
     @RequestMapping(value = "/export_teach_college_result", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "开课成绩查询信息", response = TBExamStudentResult.class)})
     public void exportTeachCollegeResult(
-            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考试类型", required = true) @RequestParam(required = false) Boolean current,
@@ -102,14 +101,14 @@ public class TBExamStudentController {
             @ApiParam(value = "模糊查询", required = true) @RequestParam(required = false) String studentParam,
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
-        tbExamStudentService.exportTeachCollegeResult(semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, column, order);
+        tbExamStudentService.exportTeachCollegeResult(SystemConstant.convertIdToLong(semesterId), examId, courseCode, current, inspectCollegeId, teacherId, studentParam, column, order);
     }
 
     @ApiOperation(value = "考查成绩查询")
     @RequestMapping(value = "/list_inspect_college_result", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "开课成绩查询信息", response = TBExamStudentResult.class)})
     public Result listInspectCollegeResult(
-            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考试类型", required = true) @RequestParam(required = false) Boolean current,
@@ -121,14 +120,14 @@ public class TBExamStudentController {
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        return ResultUtil.ok(tbExamStudentService.listInspectCollegeResult(semester, examId, courseCode, current, sysUser.getOrgId(), teacherId, clazzId, studentParam, pageNumber, pageSize, column, order));
+        return ResultUtil.ok(tbExamStudentService.listInspectCollegeResult(SystemConstant.convertIdToLong(semesterId), examId, courseCode, current, sysUser.getOrgId(), teacherId, clazzId, studentParam, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "考查成绩查询-导出查询结果")
     @RequestMapping(value = "/export_inspect_college_result", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "开课成绩查询信息", response = TBExamStudentResult.class)})
     public void exportInspectCollegeResult(
-            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+            @ApiParam(value = "学期id", required = true) @RequestParam String semesterId,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
             @ApiParam(value = "考试类型", required = true) @RequestParam(required = false) Boolean current,
@@ -139,6 +138,6 @@ public class TBExamStudentController {
             @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
             @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) throws Exception {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
-        tbExamStudentService.exportInspectCollegeResult(semester, examId, courseCode, current, sysUser.getOrgId(), teacherId, clazzId, studentParam, column, order);
+        tbExamStudentService.exportInspectCollegeResult(SystemConstant.convertIdToLong(semesterId), examId, courseCode, current, sysUser.getOrgId(), teacherId, clazzId, studentParam, column, order);
     }
 }