日常更新

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

@@ -9,7 +9,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 /**
- * @Description: 参考课程考察学院维度分析 result
+ * @Description: 参考课程考查学院维度分析 result
  * @Param:
  * @return:
  * @Author: wangliang

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

@@ -0,0 +1,41 @@
+package com.qmth.teachcloud.report.business.bean.result;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * @Description: TAExamCourseCollegeTeacherResult
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/6/16
+ */
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class TAExamCourseCollegeTeacherResult extends TAExamCourseCollegeTeacher implements Serializable {
+
+    @ApiModelProperty(value = "应届平均分赋分前")
+    private BigDecimal currentAvgScoreBefore;
+
+    @ApiModelProperty(value = "应届平均分赋分后")
+    private BigDecimal currentAvgScoreAfter;
+
+    public BigDecimal getCurrentAvgScoreBefore() {
+        return currentAvgScoreBefore;
+    }
+
+    public void setCurrentAvgScoreBefore(BigDecimal currentAvgScoreBefore) {
+        this.currentAvgScoreBefore = currentAvgScoreBefore;
+    }
+
+    public BigDecimal getCurrentAvgScoreAfter() {
+        return currentAvgScoreAfter;
+    }
+
+    public void setCurrentAvgScoreAfter(BigDecimal currentAvgScoreAfter) {
+        this.currentAvgScoreAfter = currentAvgScoreAfter;
+    }
+}

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

@@ -22,10 +22,10 @@ public class TBExamStudentResult extends TBExamStudent implements Serializable {
     @ApiModelProperty(value = "开课学院编码")
     private String teachCollegeCode;
 
-    @ApiModelProperty(value = "考察学院名称")
+    @ApiModelProperty(value = "考查学院名称")
     private String inspectCollegeName;
 
-    @ApiModelProperty(value = "考察学院编码")
+    @ApiModelProperty(value = "考查学院编码")
     private String inspectCollegeCode;
 
     @ApiModelProperty(value = "教师姓名")

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

@@ -6,7 +6,7 @@ import java.io.Serializable;
 import java.math.BigDecimal;
 
 /**
- * @Description: 考察学院-课程数据
+ * @Description: 考查学院-课程数据
  * @Author: CaoZixuan
  * @Date: 2021-06-10
  */

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

@@ -14,7 +14,7 @@ public class ExamBaseInfo implements Serializable {
     @ApiModelProperty(value = "考试时间")
     private String examTime;
 
-    @ApiModelProperty(value = "考察学院总数")
+    @ApiModelProperty(value = "考查学院总数")
     private Integer collegeCount;
 
     @ApiModelProperty(value = "课程总数")

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

@@ -5,7 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.Serializable;
 
 /**
- * @Description: 考察课程考试总览报告
+ * @Description: 考查课程考试总览报告
  * @Author: CaoZixuan
  * @Date: 2021-06-10
  */
@@ -13,7 +13,7 @@ public class InspectCourseTotalReportResult implements Serializable {
 
     @ApiModelProperty(value = "考试基础信息")
     private ExamBaseInfo examBaseInfo;
-    @ApiModelProperty(value = "该考察学院信息")
+    @ApiModelProperty(value = "该考查学院信息")
     private CollegeInfo collegeInfo;
 
     public ExamBaseInfo getExamBaseInfo() {

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

@@ -59,7 +59,7 @@ public class TAExamCourse implements Serializable {
     @TableField(value = "teach_college_name")
     private String teachCollegeName;
 
-    @ApiModelProperty(value = "考察学院数量")
+    @ApiModelProperty(value = "考查学院数量")
     @TableField(value = "inspect_college_count")
     private Integer inspectCollegeCount;
 

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

@@ -75,7 +75,7 @@ public class TAExamCourseClazz implements Serializable {
     @TableField(value = "total_count")
     private Integer totalCount;
 
-    @ApiModelProperty(value = "所属考察学院名称")
+    @ApiModelProperty(value = "所属考查学院名称")
     @TableField(value = "college_name")
     private String collegeName;
 

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

@@ -13,13 +13,13 @@ import java.util.Objects;
 
 /**
  * <p>
- * 参考课程考察学院维度分析表
+ * 参考课程考查学院维度分析表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TAExamCourseCollegeInspect对象", description = "参考课程考察学院维度分析表")
+@ApiModel(value = "TAExamCourseCollegeInspect对象", description = "参考课程考查学院维度分析表")
 public class TAExamCourseCollegeInspect implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -12,13 +12,13 @@ import java.math.BigDecimal;
 
 /**
  * <p>
- * 参考课程考察学院各考察点维度表
+ * 参考课程考查学院各考查点维度表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TAExamCourseCollegeInspectDio对象", description = "参考课程考察学院各考察点维度表")
+@ApiModel(value = "TAExamCourseCollegeInspectDio对象", description = "参考课程考查学院各考查点维度表")
 public class TAExamCourseCollegeInspectDio implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -59,15 +59,15 @@ public class TAExamCourseCollegeInspectDio implements Serializable {
     @TableField(value = "dimension_type")
     private String dimensionType;
 
-    @ApiModelProperty(value = "考察点编号")
+    @ApiModelProperty(value = "考查点编号")
     @TableField(value = "dimension_code")
     private String dimensionCode;
 
-    @ApiModelProperty(value = "考察点学院学生平均得分")
+    @ApiModelProperty(value = "考查点学院学生平均得分")
     @TableField(value = "avg_score")
     private BigDecimal avgScore;
 
-    @ApiModelProperty(value = "该考察点学院平均得分率")
+    @ApiModelProperty(value = "该考查点学院平均得分率")
     @TableField(value = "score_rate")
     private BigDecimal scoreRate;
 

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

@@ -107,12 +107,12 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     @TableField(value = "total_count")
     private Integer totalCount;
 
-    @ApiModelProperty(value = "考察学院id")
+    @ApiModelProperty(value = "考查学院id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "inspect_college_id")
     private Long inspectCollegeId;
 
-    @ApiModelProperty(value = "考察学院名称")
+    @ApiModelProperty(value = "考查学院名称")
     @TableField(value = "inspect_college_name")
     private String inspectCollegeName;
 
@@ -125,11 +125,11 @@ public class TAExamCourseCollegeTeacher implements Serializable {
     @TableField(value = "teach_college_name")
     private String teachCollegeName;
 
-    @ApiModelProperty(value = "在考察学院排名")
+    @ApiModelProperty(value = "在考查学院排名")
     @TableField(value = "teacher_rank")
     private Integer teacherRank;
 
-    @ApiModelProperty(value = "在考察学院教师总人数")
+    @ApiModelProperty(value = "在考查学院教师总人数")
     @TableField(value = "teacher_count")
     private Integer teacherCount;
 

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

@@ -12,13 +12,13 @@ import java.math.BigDecimal;
 
 /**
  * <p>
- * 参考课程试卷考察点（整体情况）维度表
+ * 参考课程试卷考查点（整体情况）维度表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TAExamCourseDio对象", description = "参考课程试卷考察点（整体情况）维度表")
+@ApiModel(value = "TAExamCourseDio对象", description = "参考课程试卷考查点（整体情况）维度表")
 public class TAExamCourseDio implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -51,23 +51,23 @@ public class TAExamCourseDio implements Serializable {
     @TableField(value = "paper_id")
     private Long paperId;
 
-    @ApiModelProperty(value = "考察点类型")
+    @ApiModelProperty(value = "考查点类型")
     @TableField(value = "dimension_type")
     private String dimensionType;
 
-    @ApiModelProperty(value = "考察点编号")
+    @ApiModelProperty(value = "考查点编号")
     @TableField(value = "dimension_code")
     private String dimensionCode;
 
-    @ApiModelProperty(value = "该考察点平均得分率")
+    @ApiModelProperty(value = "该考查点平均得分率")
     @TableField(value = "score_rate")
     private BigDecimal scoreRate;
 
-    @ApiModelProperty(value = "该考察点在试卷中的总分")
+    @ApiModelProperty(value = "该考查点在试卷中的总分")
     @TableField(value = "total_score")
     private BigDecimal totalScore;
 
-    @ApiModelProperty(value = "该考察点考察的题目数量")
+    @ApiModelProperty(value = "该考查点考查的题目数量")
     @TableField(value = "total_count")
     private BigDecimal totalCount;
 

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

@@ -102,7 +102,7 @@ public class TAExamCourseRecord implements Serializable {
     @TableField(value = "teach_college_id")
     private Long teachCollegeId;
 
-    @ApiModelProperty(value = "考察学院id")
+    @ApiModelProperty(value = "考查学院id")
     @TableField(value = "inspect_college_id")
     private Long inspectCollegeId;
 

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

@@ -12,13 +12,13 @@ import java.math.BigDecimal;
 
 /**
  * <p>
- * 参考课程考生各考察点维度分析表
+ * 参考课程考生各考查点维度分析表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TAExamCourseRecordDio对象", description = "参考课程考生各考察点维度分析表")
+@ApiModel(value = "TAExamCourseRecordDio对象", description = "参考课程考生各考查点维度分析表")
 public class TAExamCourseRecordDio implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -85,12 +85,12 @@ public class TAExamCourseRecordDio implements Serializable {
     @TableField(value = "proficiency")
     private String proficiency;
 
-    @ApiModelProperty(value = "所属考察学院id")
+    @ApiModelProperty(value = "所属考查学院id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "inspect_college_id")
     private Long inspectCollegeId;
 
-    @ApiModelProperty(value = "所属考察学院名称")
+    @ApiModelProperty(value = "所属考查学院名称")
     @TableField(value = "inspect_college_name")
     private String inspectCollegeName;
 

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

@@ -12,13 +12,13 @@ import java.math.BigDecimal;
 
 /**
  * <p>
- * 参考课程考生考察点模块维度表
+ * 参考课程考生考查点模块维度表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TAExamCourseRecordMod对象", description = "参考课程考生考察点模块维度表")
+@ApiModel(value = "TAExamCourseRecordMod对象", description = "参考课程考生考查点模块维度表")
 public class TAExamCourseRecordMod implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -65,7 +65,7 @@ public class TAExamCourseRecordMod implements Serializable {
     @TableField(value = "student_code")
     private String studentCode;
 
-    @ApiModelProperty(value = "考察模块名称")
+    @ApiModelProperty(value = "考查模块名称")
     @TableField(value = "module_type")
     private String moduleType;
 
@@ -73,11 +73,11 @@ public class TAExamCourseRecordMod implements Serializable {
     @TableField(value = "total_score")
     private BigDecimal totalScore;
 
-    @ApiModelProperty(value = "该学生在该考察模块的整体掌握率（total_score/full_score）")
+    @ApiModelProperty(value = "该学生在该考查模块的整体掌握率（total_score/full_score）")
     @TableField(value = "score_rate")
     private BigDecimal scoreRate;
 
-    @ApiModelProperty(value = "考察模块在试卷中的总分(实际分)")
+    @ApiModelProperty(value = "考查模块在试卷中的总分(实际分)")
     @TableField(value = "full_score")
     private BigDecimal fullScore;
 
@@ -97,12 +97,12 @@ public class TAExamCourseRecordMod implements Serializable {
     @TableField(value = "level")
     private String level;
 
-    @ApiModelProperty(value = "考生所属考察学院id")
+    @ApiModelProperty(value = "考生所属考查学院id")
     @JsonSerialize(using = ToStringSerializer.class)
     @TableField(value = "inspect_college_id")
     private Long inspectCollegeId;
 
-    @ApiModelProperty(value = "考生所属考察学院名称")
+    @ApiModelProperty(value = "考生所属考查学院名称")
     @TableField(value = "inspect_college_name")
     private String inspectCollegeName;
 

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

@@ -37,11 +37,11 @@ public class TAExamTotal implements Serializable {
     @TableField(value = "school_id")
     private Long schoolId;
 
-    @ApiModelProperty(value = "考察学院总数")
+    @ApiModelProperty(value = "考查学院总数")
     @TableField(value = "college_count")
     private Integer collegeCount;
 
-    @ApiModelProperty(value = "考察学院名称")
+    @ApiModelProperty(value = "考查学院名称")
     @TableField(value = "college_names")
     private String collegeNames;
 

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

@@ -11,13 +11,13 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 考察点维度基础表
+ * 考查点维度基础表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TBDimension对象", description = "考察点维度基础表")
+@ApiModel(value = "TBDimension对象", description = "考查点维度基础表")
 public class TBDimension implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -11,13 +11,13 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 考察点模块配置表
+ * 考查点模块配置表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TBModuleConfig对象", description = "考察点模块配置表")
+@ApiModel(value = "TBModuleConfig对象", description = "考查点模块配置表")
 public class TBModuleConfig implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -11,13 +11,13 @@ import java.io.Serializable;
 
 /**
  * <p>
- * 模块二级考察点维度熟练度配置，及模块简要描述表
+ * 模块二级考查点维度熟练度配置，及模块简要描述表
  * </p>
  *
  * @author wangliang
  * @since 2021-06-01
  */
-@ApiModel(value = "TBModuleProficiency对象", description = "模块二级考察点维度熟练度配置，及模块简要描述表")
+@ApiModel(value = "TBModuleProficiency对象", description = "模块二级考查点维度熟练度配置，及模块简要描述表")
 public class TBModuleProficiency implements Serializable {
 
     private static final long serialVersionUID = 1L;

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 参考课程考察学院各考察点维度表 Mapper 接口
+ * 参考课程考查学院各考查点维度表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- * 参考课程考察学院维度分析表 Mapper 接口
+ * 参考课程考查学院维度分析表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseDio;
 
 /**
  * <p>
- * 参考课程试卷考察点（整体情况）维度表 Mapper 接口
+ * 参考课程试卷考查点（整体情况）维度表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -3,8 +3,10 @@ package com.qmth.teachcloud.report.business.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 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.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
@@ -48,4 +50,16 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
                                                  @Param("publishStatus") String publishStatus);
 
     Map<String, String> getScoreAndRate(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+
+    /**
+     * 开课课程考试总览-教师各课堂成绩排名接口
+     *
+     * @param iPage
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @return
+     */
+    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 }

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

@@ -10,7 +10,7 @@ import java.util.List;
 
 /**
  * <p>
- * 参考课程考生各考察点维度分析表 Mapper 接口
+ * 参考课程考生各考查点维度分析表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseRecordMod;
 
 /**
  * <p>
- * 参考课程考生考察点模块维度表 Mapper 接口
+ * 参考课程考生考查点模块维度表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -9,7 +9,7 @@ import java.util.List;
 
 /**
  * <p>
- * 考察点维度基础表 Mapper 接口
+ * 考查点维度基础表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -31,7 +31,7 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
     List<TBExamStudentResult> selectTeachCollegeList(@Param("schoolId") Long schoolId, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
     /**
-     * 查询考察学院列表
+     * 查询考查学院列表
      *
      * @param schoolId
      * @param examId

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 考察点模块配置表 Mapper 接口
+ * 考查点模块配置表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TBModuleProficiency;
 
 /**
  * <p>
- * 模块二级考察点维度熟练度配置，及模块简要描述表 Mapper 接口
+ * 模块二级考查点维度熟练度配置，及模块简要描述表 Mapper 接口
  * </p>
  *
  * @author wangliang

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

@@ -26,7 +26,7 @@ public interface AnalyzeForReportService {
     String buildAnalyzeExamCourseRecord(Long examId, String courseCode);
 
     /**
-     * 构建以考试课程-考察学院维度的分析表 't_a_exam_course_college_inspect'
+     * 构建以考试课程-考查学院维度的分析表 't_a_exam_course_college_inspect'
      *
      * @param examId     考试id
      * @param courseCode 课程编号
@@ -46,22 +46,22 @@ public interface AnalyzeForReportService {
     String buildAnalyzeExamCourseClazz(Long examId, String courseCode);
 
     /**
-     * 分析计算某科目考试的所有考察点得分率并将计算结果插入't_a_exam_course_dio'和't_a_exam_course_record_dio'和‘t_a_exam_course_record_mod’表中
+     * 分析计算某科目考试的所有考查点得分率并将计算结果插入't_a_exam_course_dio'和't_a_exam_course_record_dio'和‘t_a_exam_course_record_mod’表中
      * <p>计算公式
-     * 个人得分率 = 该学生在该考察点的得分/该考察点在此次考试所占分数
-     * 平均得分率 = 参考学生在该考察点的得分平均值/该考察点在此次考试所占分数
+     * 个人得分率 = 该学生在该考查点的得分/该考查点在此次考试所占分数
+     * 平均得分率 = 参考学生在该考查点的得分平均值/该考查点在此次考试所占分数
      * </p>
      *
      * <p>计算过程
      * 1.获取该科目考试所有参考学生的数据源
      * 2.获取该科目考试的试卷结构的数据信息
-     * 3.获取该科目考试所有考察点的数据源
+     * 3.获取该科目考试所有考查点的数据源
      * 4.获取该科目考试考生每题答题记录详情数据源
      * <p>
-     * 5.计算每个考察点所对应的题目集合
-     * 6.计算每个考察点在此次考试所占分数
+     * 5.计算每个考查点所对应的题目集合
+     * 6.计算每个考查点在此次考试所占分数
      * 7.计算每个考生各个知识点得分率并更新't_a_exam_course_record_dio'表
-     * 8.计算此次考试各个考察点得分率并插入't_a_exam_course_dio'表
+     * 8.计算此次考试各个考查点得分率并插入't_a_exam_course_dio'表
      * </p>
      *
      * @param examId     考试id
@@ -71,7 +71,7 @@ public interface AnalyzeForReportService {
     String AnalyzePointScoreRate(Long examId, String courseCode) throws Exception;
 
     /**
-     * 构建考试课程考察学院维度分析表
+     * 构建考试课程考查学院维度分析表
      *
      * @param examId     考试id
      * @param courseCode 课程编号

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

@@ -4,7 +4,7 @@ import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.In
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
 /**
- * @Description: 考察课程考试总览
+ * @Description: 考查课程考试总览
  * @Author: CaoZixuan
  * @Date: 2021-06-10
  */

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeInspectDio;
 
 /**
  * <p>
- * 参考课程考察学院各考察点维度表 服务类
+ * 参考课程考查学院各考查点维度表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 参考课程考察学院维度分析表 服务类
+ * 参考课程考查学院维度分析表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseDio;
 
 /**
  * <p>
- * 参考课程试卷考察点（整体情况）维度表 服务类
+ * 参考课程试卷考查点（整体情况）维度表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseRecordDio;
 
 /**
  * <p>
- * 参考课程考生各考察点维度分析表 服务类
+ * 参考课程考生各考查点维度分析表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseRecordMod;
 
 /**
  * <p>
- * 参考课程考生考察点模块维度表 服务类
+ * 参考课程考生考查点模块维度表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.CollegeAndCourseResult;
 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.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
@@ -70,4 +71,16 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @return
      */
     Object surveyTeacherView(Long schoolId, SemesterEnum semester, Long examId, String courseCode);
+
+    /**
+     * 开课课程考试总览-教师各课堂成绩排名接口
+     *
+     * @param iPage
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @return
+     */
+    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode);
 }

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

@@ -8,7 +8,7 @@ import java.util.List;
 
 /**
  * <p>
- * 考察点维度基础表 服务类
+ * 考查点维度基础表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -32,7 +32,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
     List<TBExamStudentResult> selectTeachCollegeList(Long schoolId, Long examId, String courseCode);
 
     /**
-     * 查询考察学院列表
+     * 查询考查学院列表
      *
      * @param schoolId
      * @param examId

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

@@ -7,7 +7,7 @@ import java.util.List;
 
 /**
  * <p>
- * 考察点模块配置表 服务类
+ * 考查点模块配置表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -5,7 +5,7 @@ import com.qmth.teachcloud.report.business.entity.TBModuleProficiency;
 
 /**
  * <p>
- * 模块二级考察点维度熟练度配置，及模块简要描述表 服务类
+ * 模块二级考查点维度熟练度配置，及模块简要描述表 服务类
  * </p>
  *
  * @author wangliang

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

@@ -231,7 +231,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
             /*
                 学院信息
              */
-            // TODO: 2021/6/7 考察学院数量算进去往届和缺考的吗
+            // TODO: 2021/6/7 考查学院数量算进去往届和缺考的吗
             List<TBExamStudent> tbExamStudentList = tbExamStudentService.list(new QueryWrapper<TBExamStudent>().lambda()
                     .eq(TBExamStudent::getExamId, examId).eq(TBExamStudent::getCourseCode, effectiveCourseCode));
 
@@ -524,7 +524,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
             List<TAExamCourseRecord> effectiveDatasource = dataSource.stream()
                     .filter(e -> effectiveCourseCode.equals(e.getCourseCode()) && !e.getAbsent() && e.getStudentCurrent()).collect(Collectors.toList());
 
-            // 考察点数据源
+            // 考查点数据源
             List<TBDimension> dimensionDatasource = tbDimensionService.list(new QueryWrapper<TBDimension>().lambda()
                     .eq(TBDimension::getExamId, examId)
                     .eq(TBDimension::getCourseCode, effectiveCourseCode));
@@ -568,20 +568,20 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                     throw ExceptionResultEnum.ERROR.exception("试卷id为[" + paperId + "]的考生作答详细记录不存在");
                 }
 
-                // 5.计算每个考察点所对应的题目集合
+                // 5.计算每个考查点所对应的题目集合
                 Map<String, List<TBPaperStruct>> pointToPaper = this.handlePointToPaper(dimensionDatasource, tbPaperStructList, examId, effectiveCourseCode);
 
                 // 计算每个模块对应的题目集合
                 Map<String, List<TBPaperStruct>> moduleToPaper = this.handleModuleToPaper(dimensionDatasource, tbPaperStructList, examId, effectiveCourseCode);
 
-                // 6.计算每个考察点在此次考试所占分数
+                // 6.计算每个考查点在此次考试所占分数
                 Map<String, Object> everyPointTotalScore = this.handleEveryPointTotalScore(pointToPaper);
 
                 // 计算每个模块在此次考试中所占分数
                 Map<String, Object> everyModuleTotalScore = this.handleEveryPointTotalScore(moduleToPaper);
 
                 // TODO: 2021/6/7 数据组装
-                // 7.计算每个考生各个考察点和考察模块得分率并更新't_a_exam_course_record_dio'表和't_a_exam_course_record_mod'表
+                // 7.计算每个考生各个考查点和考查模块得分率并更新't_a_exam_course_record_dio'表和't_a_exam_course_record_mod'表
                 List<TAExamCourseRecordDio> taExamCourseRecordDioList = new ArrayList<>();
                 List<TAExamCourseRecordMod> taExamCourseRecordModList = new ArrayList<>();
                 for (TAExamCourseRecord taExamCourseRecord : effectiveDatasource) {
@@ -593,22 +593,22 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                     if (oneStudentAnswerDetailDataSource.size() == 0) {
                         continue; // 当AB卷时，examPaperTikDataSource还是整体数据，所以会匹配不到，匹配不到的说明不是本套试卷，因此匹配不到的不能处理。
                     }
-                    // 考察点得分率
-                    for (String s : pointToPaper.keySet()) { // 遍历考察知识点所对应的题目集合键值对
+                    // 考查点得分率
+                    for (String s : pointToPaper.keySet()) { // 遍历考查知识点所对应的题目集合键值对
                         List<TBPaperStruct> paperStructList = pointToPaper.get(s);
 
                         final String split = SystemConstant.HYPHEN;
                         Set<String> questionIndex = paperStructList
                                 .stream()
                                 .map(e -> e.getNumberType() + split + e.getBigQuestionNumber() + split + e.getSmallQuestionNumber())
-                                .collect(Collectors.toSet()); // 该考察点考察到的所有试题在试卷结构（paper）中'题号类型-大题号-小题号'组成的索引集合
+                                .collect(Collectors.toSet()); // 该考查点考查到的所有试题在试卷结构（paper）中'题号类型-大题号-小题号'组成的索引集合
 
 
                         // 获取学生在该知识点的总得分
                         double studentScore = oneStudentAnswerDetailDataSource.stream()
                                 .filter(e -> questionIndex.contains(e.getNumberType() + split + e.getMainNumber() + split + e.getSubNumber()))
                                 .collect(Collectors.summarizingDouble(e -> e.getScore().doubleValue()))
-                                .getSum();  // 查找该考察点所考察的所有试题在试卷结构（paper）中的索引（'题号类型-大题号-小题号'）包含该学生每题答题记录的索引的答题记录信息，计算描述统计
+                                .getSum();  // 查找该考查点所考查的所有试题在试卷结构（paper）中的索引（'题号类型-大题号-小题号'）包含该学生每题答题记录的索引的答题记录信息，计算描述统计
 
                         // 获取该知识点在试卷中的总得分
                         double totalScore = (double) everyPointTotalScore.get(s);
@@ -634,7 +634,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                         taExamCourseRecordDio.setCourseName(basicCourseService.findByCourseCode(effectiveCourseCode).getName());
                         String[] dimCodeArr = s.split("-");
                         if (dimCodeArr.length != 2) {
-                            throw ExceptionResultEnum.ERROR.exception("获得的考察点标识不符合标准,标准为 type-dimensionCode,结果为:  " + s);
+                            throw ExceptionResultEnum.ERROR.exception("获得的考查点标识不符合标准,标准为 type-dimensionCode,结果为:  " + s);
                         }
                         String dimensionType = dimCodeArr[0];
                         String dimensionCode = dimCodeArr[1];
@@ -647,8 +647,8 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                         taExamCourseRecordDio.setInspectCollegeName(inspectCollegeName);
                         taExamCourseRecordDioList.add(taExamCourseRecordDio);
                     }
-                    // 考察模块得分率
-                    for (String s : moduleToPaper.keySet()) { // 遍历考察模块对应的题目集合键值对
+                    // 考查模块得分率
+                    for (String s : moduleToPaper.keySet()) { // 遍历考查模块对应的题目集合键值对
                         List<TBPaperStruct> paperStructList = moduleToPaper.get(s);
 
                         final String split = SystemConstant.HYPHEN;
@@ -656,13 +656,13 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                         Set<String> questionIndex = paperStructList
                                 .stream()
                                 .map(e -> e.getNumberType() + split + e.getBigQuestionNumber() + split + e.getSmallQuestionNumber())
-                                .collect(Collectors.toSet()); // 该考察点考察到的所有试题在试卷结构（paper）中'题号类型-大题号-小题号'组成的索引集合
+                                .collect(Collectors.toSet()); // 该考查点考查到的所有试题在试卷结构（paper）中'题号类型-大题号-小题号'组成的索引集合
 
                         // 获取学生在该知识点的总得分
                         double studentScore = oneStudentAnswerDetailDataSource.stream()
                                 .filter(e -> questionIndex.contains(e.getNumberType() + split + e.getMainNumber() + split + e.getSubNumber()))
                                 .collect(Collectors.summarizingDouble(e -> e.getScore().doubleValue()))
-                                .getSum();  // 查找该考察点所考察的所有试题在试卷结构（paper）中的索引（'题号类型-大题号-小题号'）包含该学生每题答题记录的索引的答题记录信息，计算描述统计
+                                .getSum();  // 查找该考查点所考查的所有试题在试卷结构（paper）中的索引（'题号类型-大题号-小题号'）包含该学生每题答题记录的索引的答题记录信息，计算描述统计
 
 
                         // 获取该知识点在试卷中的总得分
@@ -698,12 +698,12 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                 taExamCourseRecordDioService.saveBatch(taExamCourseRecordDioList);
                 taExamCourseRecordModService.saveBatch(taExamCourseRecordModList);
 
-                // 8.计算此次考试各个考察点得分率并插入't_a_exam_course_dio'表
+                // 8.计算此次考试各个考查点得分率并插入't_a_exam_course_dio'表
                 List<TAExamCourseDio> taExamCourseDioList = new ArrayList<>();
                 for (String s : everyPointTotalScore.keySet()) {
                     String[] dimCodeArr = s.split("-");
                     if (dimCodeArr.length != 2) {
-                        throw ExceptionResultEnum.ERROR.exception("获得的考察点标识不符合标准,标准为 type-dimensionCode,结果为:  " + s);
+                        throw ExceptionResultEnum.ERROR.exception("获得的考查点标识不符合标准,标准为 type-dimensionCode,结果为:  " + s);
                     }
                     String dimensionType = dimCodeArr[0];
                     String dimensionCode = dimCodeArr[1];
@@ -983,11 +983,11 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
         List<TAExamCourseRecord> taExamCourseRecordList = taExamCourseRecordService.list(new QueryWrapper<TAExamCourseRecord>().lambda()
                 .eq(TAExamCourseRecord::getExamId, examId));
 
-        //考察学院
+        //考查学院
         // TODO: 2021/6/8 是否计算只有缺考的学院 是否计算只有往届的学院
         List<Long> inspectCollegeInfo = taExamCourseRecordList.stream()
                 .map(TAExamCourseRecord::getInspectCollegeId).distinct().collect(Collectors.toList());
-        // 考察学院数量
+        // 考查学院数量
         int collegeCount = inspectCollegeInfo.size();
         String inspectCollegeNames = "";
         if (collegeCount > 0) {
@@ -995,7 +995,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                 SysOrg college = sysOrgService.getById(inspectCollegeId);
                 inspectCollegeNames = inspectCollegeNames + college.getName() + "、";
             }
-            // 考察学院名称
+            // 考查学院名称
             inspectCollegeNames = inspectCollegeNames.substring(0, inspectCollegeNames.length() - 1);
         }
 
@@ -1063,14 +1063,14 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                     .eq(TAExamCourseRecord::getExamId, examId)
                     .eq(TAExamCourseRecord::getCourseCode, effectiveCourseCode));
 
-            // 考察学院
+            // 考查学院
             Set<Long> inspectCollegeIdSet = dataSource.stream().map(TAExamCourseRecord::getInspectCollegeId).collect(Collectors.toSet());
 
 
             for (Long inspectCollegeId : inspectCollegeIdSet) {
                 // 算教师排名用
                 List<TAExamCourseCollegeTeacher> rankTempList = new ArrayList<>();
-                // 该考察学院维度下授课教师
+                // 该考查学院维度下授课教师
                 Set<Long> teacherIdSet = dataSource.stream()
                         .filter(e -> inspectCollegeId.equals(e.getInspectCollegeId()))
                         .map(TAExamCourseRecord::getTeacherId)
@@ -1355,7 +1355,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
 
         //查询出该学生所在学院的全体学生在该科目的考试情况
         List<TAExamCourseRecord> examRecordSameCol = taExamCourseRecordList.stream()
-                .filter(e -> taExamCourseRecord.getInspectCollegeId().equals(e.getInspectCollegeId())).collect(Collectors.toList()); // 同考察学院考生数据
+                .filter(e -> taExamCourseRecord.getInspectCollegeId().equals(e.getInspectCollegeId())).collect(Collectors.toList()); // 同考查学院考生数据
 
         //计算超过学院百分比
         double lowCount = examRecordSameCol.stream().filter(e -> e.getAssignedScore().compareTo(taExamCourseRecord.getAssignedScore()) < 0).count();
@@ -1415,14 +1415,14 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
     }
 
     /**
-     * 计算每个考察点所对应的该考试所有题目信息集合（如果要仅记录本次考试匹配到的考察点，那么要判断只有当paperList.size() > 0的结果才put进Map键值对）
+     * 计算每个考查点所对应的该考试所有题目信息集合（如果要仅记录本次考试匹配到的考查点，那么要判断只有当paperList.size() > 0的结果才put进Map键值对）
      * 通过模块枚举类进行匹配，可以在枚举类横向扩展维度但要和paper表结构对应
      *
      * @param dimensionDatasource 知识点数据源
      * @param tbPaperStructList   试卷结构数据源
      * @param examId              考试id
      * @param courseCode          课程编号
-     * @return 键值对 （类型-考察点 -> 考察此考察点的题目信息集合） 例如 ：”知识模块-A“，List<>
+     * @return 键值对 （类型-考查点 -> 考查此考查点的题目信息集合） 例如 ：”知识模块-A“，List<>
      */
     private Map<String, List<TBPaperStruct>> handlePointToPaper(List<TBDimension> dimensionDatasource, List<TBPaperStruct> tbPaperStructList, Long examId, String courseCode) throws NoSuchFieldException, NoSuchMethodException, InvocationTargetException, IllegalAccessException {
         Map<String, List<TBPaperStruct>> pointToPaper = new HashMap<>();
@@ -1435,27 +1435,27 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
 
         for (TBModuleConfig value : tbModuleConfigList) {
 
-            //每个考察点所对应的题目集合
+            //每个考查点所对应的题目集合
             List<TBDimension> pointList = dimensionDatasource
-                    .stream().filter(e -> value.getModuleType().equals(e.getDimensionType())).collect(Collectors.toList());  //对应某个模块的考察点集合
+                    .stream().filter(e -> value.getModuleType().equals(e.getDimensionType())).collect(Collectors.toList());  //对应某个模块的考查点集合
 
-            Set<String> keysOne = pointList.stream().map(TBDimension::getCodePrimary).collect(Collectors.toSet());   //考察点一级维度不重复的code集合
-            Set<String> keysTwo = pointList.stream().map(TBDimension::getCodeSecond).collect(Collectors.toSet());   //考察点二级维度不重复的code集合
+            Set<String> keysOne = pointList.stream().map(TBDimension::getCodePrimary).collect(Collectors.toSet());   //考查点一级维度不重复的code集合
+            Set<String> keysTwo = pointList.stream().map(TBDimension::getCodeSecond).collect(Collectors.toSet());   //考查点二级维度不重复的code集合
 
             for (String tmpOne : keysOne) {
                 List<TBPaperStruct> paperStructList = new ArrayList<>();
                 for (TBPaperStruct paperStruct : tbPaperStructList) {
                     Field field = paperStruct.getClass().getDeclaredField(value.getAttribute()); //获取该模块对应试卷结构中的属性
                     Method getMethod = paperStruct.getClass().getDeclaredMethod("get" + ConversionUtils.initCap(field.getName())); //获取该属性的get方法
-                    String dimensions = (String) getMethod.invoke(paperStruct); //调用该属性的get方法获取改题目的考察点
+                    String dimensions = (String) getMethod.invoke(paperStruct); //调用该属性的get方法获取改题目的考查点
                     if (dimensions != null && dimensions.length() > 0) {
                         if (dimensions.contains(tmpOne)) {
-                            paperStructList.add(paperStruct);  //如果该题目包含考察点，则记录该题目
+                            paperStructList.add(paperStruct);  //如果该题目包含考查点，则记录该题目
                         }
                     }
                 }
                 if (paperStructList.size() > 0) {
-                    // 只记录试卷结构中出现的考察点包含的题目
+                    // 只记录试卷结构中出现的考查点包含的题目
                     pointToPaper.put(value.getModuleType() + "-" + tmpOne, paperStructList);
                 }
             }
@@ -1473,7 +1473,7 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
                     }
                 }
                 if (paperStructList.size() > 0) {
-                    // 只记录试卷结构中出现的考察点包含的题目
+                    // 只记录试卷结构中出现的考查点包含的题目
                     pointToPaper.put(value.getModuleType() + "-" + tmpTwo, paperStructList);
                 }
             }
@@ -1482,13 +1482,13 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
     }
 
     /**
-     * 计算每个考察模块对应的题目集合
+     * 计算每个考查模块对应的题目集合
      *
      * @param dimensionDatasource 知识点数据源
      * @param tbPaperStructList   试卷结构数据源
      * @param examId              考试id
      * @param courseCode          课程编号
-     * @return 键值对 （考察模块 -> 考察此考模块的题目信息集合） 例如 ：”知识模块“，List<>
+     * @return 键值对 （考查模块 -> 考查此考模块的题目信息集合） 例如 ：”知识模块“，List<>
      * @throws Exception 反射异常
      */
     private Map<String, List<TBPaperStruct>> handleModuleToPaper(List<TBDimension> dimensionDatasource, List<TBPaperStruct> tbPaperStructList, Long examId, String courseCode) throws Exception {
@@ -1524,11 +1524,11 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
     }
 
     /**
-     * 计算每个模块或考察点在该考试中的分数
+     * 计算每个模块或考查点在该考试中的分数
      * （其实就是计算试题集合总分）
      *
-     * @param questionMap 考察点或模块对应的题目信息集合
-     * @return 键值对 （考察点 -> 该考察点在此次考试所占分数） 例如 ：”知识模块-A“，46.0000、（模块 -> 该考察点在此次考试所占分数） 例如 ：”能力模块“，75.0000
+     * @param questionMap 考查点或模块对应的题目信息集合
+     * @return 键值对 （考查点 -> 该考查点在此次考试所占分数） 例如 ：”知识模块-A“，46.0000、（模块 -> 该考查点在此次考试所占分数） 例如 ：”能力模块“，75.0000
      */
     private Map<String, Object> handleEveryPointTotalScore(Map<String, List<TBPaperStruct>> questionMap) {
         Map<String, Object> result = new HashMap<>();
@@ -1541,11 +1541,11 @@ public class AnalyzeForReportServiceImpl implements AnalyzeForReportService {
     }
 
     /**
-     * 根据考察点得分率计算该考察点的熟练度
+     * 根据考查点得分率计算该考查点的熟练度
      *
      * @param examId        考试id
      * @param courseCode    课程编号
-     * @param dimensionType 考察点类型
+     * @param dimensionType 考查点类型
      * @param value         得分率
      * @return 熟练度等级
      */

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

@@ -302,7 +302,7 @@ public class ReportCommonServiceImpl implements ReportCommonService {
             throw ExceptionResultEnum.DATA_ERROR.exception();
         }
         List<ModuleDimensionResult> dimensionAnalyzeList = new ArrayList<>();
-        Set<String> moduleSet = dimensionInfoDatasource.stream().map(e -> e.getModule()).collect(Collectors.toSet()); // 考察模块集合
+        Set<String> moduleSet = dimensionInfoDatasource.stream().map(e -> e.getModule()).collect(Collectors.toSet()); // 考查模块集合
         for (String module : moduleSet) {
             List<CourseDimensionResult> dimensionInfoList = dimensionInfoDatasource
                     .stream().filter(e -> module.equals(e.getModule())).collect(Collectors.toList());

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

@@ -16,7 +16,7 @@ import java.util.List;
 
 /**
  * <p>
- * 参考课程考察学院各考察点维度表 服务实现类
+ * 参考课程考查学院各考查点维度表 服务实现类
  * </p>
  *
  * @author wangliang
@@ -32,10 +32,10 @@ public class TAExamCourseCollegeInspectDioServiceImpl extends ServiceImpl<TAExam
     @Transactional(rollbackFor = Exception.class)
     @Override
     public void insertByTAExamCourseRecordDio(Long examId, String courseCode) {
-        if (examId == 0 || courseCode == null || courseCode.length() == 0){
+        if (examId == 0 || courseCode == null || courseCode.length() == 0) {
             throw ExceptionResultEnum.ERROR.exception("参数异常");
         }
-        List<TAExamCourseCollegeInspectDio> taExamCourseCollegeInspectDioList = taExamCourseCollegeInspectDioMapper.findByTAExamCourseRecordDio(examId,courseCode);
+        List<TAExamCourseCollegeInspectDio> taExamCourseCollegeInspectDioList = taExamCourseCollegeInspectDioMapper.findByTAExamCourseRecordDio(examId, courseCode);
         for (TAExamCourseCollegeInspectDio taExamCourseCollegeInspectDio : taExamCourseCollegeInspectDioList) {
             taExamCourseCollegeInspectDio.setSchoolId(tbExamService.getById(taExamCourseCollegeInspectDio.getExamId()).getSchoolId());
             taExamCourseCollegeInspectDio.setId(SystemConstant.getDbUuid());

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- * 参考课程考察学院维度分析表 服务实现类
+ * 参考课程考查学院维度分析表 服务实现类
  * </p>
  *
  * @author wangliang

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 参考课程试卷考察点（整体情况）维度表 服务实现类
+ * 参考课程试卷考查点（整体情况）维度表 服务实现类
  * </p>
  *
  * @author wangliang

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 参考课程考生各考察点维度分析表 服务实现类
+ * 参考课程考生各考查点维度分析表 服务实现类
  * </p>
  *
  * @author wangliang

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 参考课程考生考察点模块维度表 服务实现类
+ * 参考课程考生考查点模块维度表 服务实现类
  * </p>
  *
  * @author wangliang

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

@@ -197,4 +197,19 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         map.put("surveyTeacher", surveyTeacherExamCourseResult);
         return map;
     }
+
+    /**
+     * 开课课程考试总览-教师各课堂成绩排名接口
+     *
+     * @param iPage
+     * @param schoolId
+     * @param semester
+     * @param examId
+     * @param courseCode
+     * @return
+     */
+    @Override
+    public IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode) {
+        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, semester.name(), examId, courseCode);
+    }
 }

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

@@ -12,7 +12,7 @@ import java.util.List;
 
 /**
  * <p>
- * 考察点维度基础表 服务实现类
+ * 考查点维度基础表 服务实现类
  * </p>
  *
  * @author wangliang

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

@@ -90,7 +90,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     /**
-     * 查询考察学院列表
+     * 查询考查学院列表
      *
      * @param schoolId
      * @param examId

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

@@ -11,7 +11,7 @@ import java.util.List;
 
 /**
  * <p>
- * 考察点模块配置表 服务实现类
+ * 考查点模块配置表 服务实现类
  * </p>
  *
  * @author wangliang

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

@@ -8,7 +8,7 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 模块二级考察点维度熟练度配置，及模块简要描述表 服务实现类
+ * 模块二级考查点维度熟练度配置，及模块简要描述表 服务实现类
  * </p>
  *
  * @author wangliang

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/utils/MathUtil.java

@@ -152,7 +152,7 @@ public class MathUtil {
     /**
      * 给譬如 A1 B1 B2 B10 C2 这样的特殊字符串集合排序
      *
-     * @param dimensionSet 考察点字符串
+     * @param dimensionSet 考查点字符串
      * @return 排序结果
      */
     public static List<String> sortDimension(List<String> dimensionSet) {

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

@@ -75,6 +75,7 @@
             </if>
         </where>
     </select>
+
     <select id="getOverview" resultType="com.qmth.teachcloud.report.business.bean.result.ExamCourseResult">
         SELECT
             b.exam_time examTime,
@@ -103,6 +104,7 @@
             </if>
         </where>
     </select>
+
     <select id="getScoreAndRate" resultType="java.util.Map">
         SELECT
             round(a.avg_score, 1) avgScore,
@@ -126,4 +128,28 @@
             </if>
         </where>
     </select>
+
+    <select id="surveyTeacherTeacherView" resultType="com.qmth.teachcloud.report.business.bean.result.TAExamCourseCollegeTeacherResult">
+        select
+            taecct.inspect_college_name as inspectCollegeName,
+            taecct.teacher_name as teacherName,
+            taecct.avg_score as currentAvgScoreBefore,
+            taecct.avg_score_assign as currentAvgScoreAfter,
+            taecct.teacher_rank as teacherRank
+        from
+            t_a_exam_course_college_teacher taecct
+        join sys_org so on
+            so.id = taecct.inspect_college_id
+        <where>
+            <if test="schoolId != null and schoolId != ''">
+                and taecct.school_id = #{schoolId}
+            </if>
+            <if test="examId != null and examId != ''">
+                and taecct.exam_id = #{examId}
+            </if>
+            <if test="courseCode != null and courseCode != ''">
+                and taecct.course_code = #{courseCode}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -237,9 +237,9 @@ public class BasicDatasourceController {
                 });
         //保存到数据库
 
-        // 模块二级考察点维度熟练度配置，及模块简要描述表
+        // 模块二级考查点维度熟练度配置，及模块简要描述表
         List<TBModuleProficiency> tbModuleProficiencyList = new ArrayList<>();
-        // 考察点模块配置表
+        // 考查点模块配置表
         List<TBModuleConfig> tbModuleConfigList = new ArrayList<>();
 
         if (Objects.nonNull(finalList) && finalList.size() > 0) {
@@ -452,7 +452,7 @@ public class BasicDatasourceController {
             throw ExceptionResultEnum.ERROR.exception("学校id不匹配");
         }
 
-        // 该考试要考察的所有课程
+        // 该考试要考查的所有课程
         List<TBExamCourse> tbExamCourseList = tbExamCourseService.list(new QueryWrapper<TBExamCourse>().lambda().eq(TBExamCourse::getExamId, examId));
 
         List<Map> finalList = newCallApiService.callStudentScore(id, cloudExamCode);

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

@@ -42,6 +42,18 @@ public class CourseController {
         return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? (Long) ServletUtil.getRequestHeaderSchoolId() : SystemConstant.convertIdToLong(schoolId)));
     }
 
+    @ApiOperation(value = "开课课程考试总览-教师各课堂成绩排名接口")
+    @RequestMapping(value = "/survey_teacher/teacher_view", method = RequestMethod.POST)
+    @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
+    public Result surveyTeacherTeacherView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,
+                                           @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
+                                           @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) {
+        return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+    }
+
     @ApiOperation(value = "开课课程考试总览图表接口")
     @RequestMapping(value = "/survey_teacher/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
@@ -52,7 +64,7 @@ public class CourseController {
         return ResultUtil.ok(taExamCourseService.surveyTeacherView(SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
     }
 
-    @ApiOperation(value = "考察课程考试总览-公共课概况接口")
+    @ApiOperation(value = "考查课程考试总览-公共课概况接口")
     @RequestMapping(value = "/survey_inspect/view", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考试科目信息", response = TAExamCourseResult.class)})
     public Result surveyInspectView(@ApiParam(value = "考试id", required = true) @RequestParam String examId,

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

@@ -93,7 +93,7 @@ public class SysReportController {
         return ResultUtil.ok(tbExamStudentService.selectTeachCollegeList(SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode));
     }
 
-    @ApiOperation(value = "考察学院列表")
+    @ApiOperation(value = "考查学院列表")
     @RequestMapping(value = "/common/list_inspect_college", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "考生信息", response = TBExamStudentResult.class)})
     public Result listInspectCollege(@ApiParam(value = "学校id", required = true) @RequestParam String schoolId,

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 参考课程考察学院维度分析表 前端控制器
+ * 参考课程考查学院维度分析表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 参考课程考察学院各考察点维度表 前端控制器
+ * 参考课程考查学院各考查点维度表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 参考课程试卷考察点（整体情况）维度表 前端控制器
+ * 参考课程试卷考查点（整体情况）维度表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 参考课程考生各考察点维度分析表 前端控制器
+ * 参考课程考生各考查点维度分析表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 参考课程考生考察点模块维度表 前端控制器
+ * 参考课程考生考查点模块维度表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 考察点维度基础表 前端控制器
+ * 考查点维度基础表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 考察点模块配置表 前端控制器
+ * 考查点模块配置表 前端控制器
  * </p>
  *
  * @author wangliang

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

@@ -7,7 +7,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
- * 模块二级考察点维度熟练度配置，及模块简要描述表 前端控制器
+ * 模块二级考查点维度熟练度配置，及模块简要描述表 前端控制器
  * </p>
  *
  * @author wangliang