报告bug修复

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

@@ -0,0 +1,103 @@
+package com.qmth.teachcloud.report.business.bean.result;
+
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Description: ExamRecordResult
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2021/6/10
+ */
+public class ExamCourseResult implements Serializable {
+
+    @ApiModelProperty(value = "考试时间")
+    private String examTime;
+
+    @ApiModelProperty(value = "课程名称")
+    private String courseName;
+
+    @ApiModelProperty(value = "试卷满分")
+    private Double totalScore;
+
+    @ApiModelProperty(value = "全校实考人数")
+    private Integer realityCount;
+
+    @ApiModelProperty(value = "考查学院数量")
+    private Integer inspectCollegeCount;
+
+    @ApiModelProperty(value = "缺考人数")
+    private Integer absentCount;
+
+    @ApiModelProperty(value = "开课学院")
+    private String teachCollegeName;
+
+    @ApiModelProperty(value = "考查学院")
+    private String inspectCollegeName;
+
+    public String getExamTime() {
+        return examTime;
+    }
+
+    public void setExamTime(String examTime) {
+        this.examTime = examTime;
+    }
+
+    public String getCourseName() {
+        return courseName;
+    }
+
+    public void setCourseName(String courseName) {
+        this.courseName = courseName;
+    }
+
+    public Double getTotalScore() {
+        return totalScore;
+    }
+
+    public void setTotalScore(Double totalScore) {
+        this.totalScore = totalScore;
+    }
+
+    public Integer getRealityCount() {
+        return realityCount;
+    }
+
+    public void setRealityCount(Integer realityCount) {
+        this.realityCount = realityCount;
+    }
+
+    public Integer getInspectCollegeCount() {
+        return inspectCollegeCount;
+    }
+
+    public void setInspectCollegeCount(Integer inspectCollegeCount) {
+        this.inspectCollegeCount = inspectCollegeCount;
+    }
+
+    public Integer getAbsentCount() {
+        return absentCount;
+    }
+
+    public void setAbsentCount(Integer absentCount) {
+        this.absentCount = absentCount;
+    }
+
+    public String getTeachCollegeName() {
+        return teachCollegeName;
+    }
+
+    public void setTeachCollegeName(String teachCollegeName) {
+        this.teachCollegeName = teachCollegeName;
+    }
+
+    public String getInspectCollegeName() {
+        return inspectCollegeName;
+    }
+
+    public void setInspectCollegeName(String inspectCollegeName) {
+        this.inspectCollegeName = inspectCollegeName;
+    }
+}

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

@@ -10,9 +10,9 @@ public class TeacherClassRankResult {
     private String courseCode;
     private String courseName;
     private String teachCollegeName;
-    private String avgScore;
-    private String avgScoreAssign;
-    private String rank;
+    private Double avgScore;
+    private Double avgScoreAssign;
+    private Integer rank;
 
     public String getTeacherName() {
         return teacherName;
@@ -54,27 +54,27 @@ public class TeacherClassRankResult {
         this.teachCollegeName = teachCollegeName;
     }
 
-    public String getAvgScore() {
+    public Double getAvgScore() {
         return avgScore;
     }
 
-    public void setAvgScore(String avgScore) {
+    public void setAvgScore(Double avgScore) {
         this.avgScore = avgScore;
     }
 
-    public String getAvgScoreAssign() {
+    public Double getAvgScoreAssign() {
         return avgScoreAssign;
     }
 
-    public void setAvgScoreAssign(String avgScoreAssign) {
+    public void setAvgScoreAssign(Double avgScoreAssign) {
         this.avgScoreAssign = avgScoreAssign;
     }
 
-    public String getRank() {
+    public Integer getRank() {
         return rank;
     }
 
-    public void setRank(String rank) {
+    public void setRank(Integer rank) {
         this.rank = rank;
     }
 }

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

@@ -10,9 +10,9 @@ public class TeacherMyClassRankResult {
     private String courseCode;
     private String courseName;
     private String teachCollegeName;
-    private String scoreAssign;
-    private String teacherCount;
-    private String rank;
+    private Double scoreAssign;
+    private Integer teacherCount;
+    private Integer rank;
 
     public String getTeacherName() {
         return teacherName;
@@ -54,27 +54,27 @@ public class TeacherMyClassRankResult {
         this.teachCollegeName = teachCollegeName;
     }
 
-    public String getScoreAssign() {
+    public Double getScoreAssign() {
         return scoreAssign;
     }
 
-    public void setScoreAssign(String scoreAssign) {
+    public void setScoreAssign(Double scoreAssign) {
         this.scoreAssign = scoreAssign;
     }
 
-    public String getTeacherCount() {
+    public Integer getTeacherCount() {
         return teacherCount;
     }
 
-    public void setTeacherCount(String teacherCount) {
+    public void setTeacherCount(Integer teacherCount) {
         this.teacherCount = teacherCount;
     }
 
-    public String getRank() {
+    public Integer getRank() {
         return rank;
     }
 
-    public void setRank(String rank) {
+    public void setRank(Integer rank) {
         this.rank = rank;
     }
 }

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

@@ -25,7 +25,7 @@ public interface TAExamCourseCollegeTeacherMapper extends BaseMapper<TAExamCours
 
     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);
 
-    IPage<TAExamCourseCollegeTeacher> listAllTeacherClassRank(@Param("page") Page<TAExamCourseCollegeTeacher> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("teachCollegeId") Long teachCollegeId, @Param("courseCode") String courseCode, @Param("teacherId") Long teacherId);
+    IPage<TeacherClassRankResult> listAllTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("teachCollegeId") Long teachCollegeId, @Param("courseCode") String courseCode, @Param("teacherId") Long teacherId);
 
     /**
      * 查询老师得分
@@ -36,4 +36,6 @@ public interface TAExamCourseCollegeTeacherMapper extends BaseMapper<TAExamCours
      * @return
      */
     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);
 }

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

@@ -2,6 +2,7 @@ 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.TAExamCourseResult;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import org.apache.ibatis.annotations.Param;
@@ -30,7 +31,7 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
     IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId);
 
 
-    TAExamCourse getOverview(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    ExamCourseResult getOverview(@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/service/TAExamCourseCollegeTeacherService.java

@@ -23,7 +23,7 @@ public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourse
 
     IPage<TeacherMyClassRankResult> listMyClassRank(String semester, Long examId, Long teacherId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize);
 
-    IPage<TAExamCourseCollegeTeacher> listAllTeacherClassRank(String semester, Long examId, Long teachCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize);
+    IPage<TeacherClassRankResult> listAllTeacherClassRank(String semester, Long examId, Long teachCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize);
 
     /**
      * 查询老师得分
@@ -34,4 +34,6 @@ public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourse
      * @return
      */
     List<TAExamCourseTeacherResult> findTeacherInfo(Long examId, String courseCode, Long collegeId);
+
+    IPage<TeacherClassRankResult> listTeacherClassRank(String semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize);
 }

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

@@ -3,6 +3,7 @@ package com.qmth.teachcloud.report.business.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.qmth.teachcloud.report.business.bean.result.CollegeAndCourseResult;
+import com.qmth.teachcloud.report.business.bean.result.ExamCourseResult;
 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;
@@ -32,7 +33,7 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
     IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId);
 
 
-    TAExamCourse getOverview(String semester, Long examId, String courseCode);
+    ExamCourseResult getOverview(String semester, Long examId, String courseCode);
 
     /**
      * 赋分管理列表接口

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

@@ -1,8 +1,6 @@
 package com.qmth.teachcloud.report.business.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacher;
 
 /**
@@ -14,6 +12,4 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacher;
  * @since 2021-06-01
  */
 public interface TAExamCourseTeacherService extends IService<TAExamCourseTeacher> {
-
-    IPage<TAExamCourseTeacher> listTeacherClassRank(String semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize);
 }

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

@@ -46,10 +46,10 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     }
 
     @Override
-    public IPage<TAExamCourseCollegeTeacher> listAllTeacherClassRank(String semester, Long examId, Long teachCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize) {
+    public IPage<TeacherClassRankResult> listAllTeacherClassRank(String semester, Long examId, Long teachCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<TAExamCourseCollegeTeacher> page = new Page<>(pageNumber, pageSize);
-        IPage<TAExamCourseCollegeTeacher> listPage = taExamCourseCollegeTeacherMapper.listAllTeacherClassRank(page, schoolId, semester, examId, teachCollegeId, courseCode, teacherId);
+        Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
+        IPage<TeacherClassRankResult> listPage = taExamCourseCollegeTeacherMapper.listAllTeacherClassRank(page, schoolId, semester, examId, teachCollegeId, courseCode, teacherId);
         return listPage;
     }
 
@@ -65,4 +65,12 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     public List<TAExamCourseTeacherResult> findTeacherInfo(Long examId, String courseCode, Long collegeId) {
         return taExamCourseCollegeTeacherMapper.findTeacherInfo(examId, courseCode, collegeId);
     }
+
+    @Override
+    public IPage<TeacherClassRankResult> listTeacherClassRank(String semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize) {
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
+        Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
+        IPage<TeacherClassRankResult> listPage = taExamCourseCollegeTeacherMapper.listTeacherClassRank(page, schoolId, semester, examId, courseCode);
+        return listPage;
+    }
 }

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

@@ -81,7 +81,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
 
 
     @Override
-    public TAExamCourse getOverview(String semester, Long examId, String courseCode) {
+    public ExamCourseResult getOverview(String semester, Long examId, String courseCode) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         return taExamCourseMapper.getOverview(schoolId, semester, examId, courseCode);
     }
@@ -117,19 +117,19 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
             double endScore = Double.parseDouble(str[1]);
             List<TAExamCourseRecord> taExamCourseRecords = taExamCourseRecordMapper.listExamCourseRecord(schoolId, semester, examId, courseCode);
             // 全部有效人数
-            int totalRealityCount = taExamCourseRecords.size();
+            long totalRealityCount = taExamCourseRecords.stream().filter(m -> Objects.nonNull(m.getAbsent()) && !m.getAbsent()).count();
             // 本分数段人数
             long totalScoreCount = taExamCourseRecords.stream().filter(m -> m.getAssignedScore().doubleValue() >= startScore && m.getAssignedScore().doubleValue() <= endScore).count();
             // 应届有效人数
-            long totalCurrentCount = taExamCourseRecords.stream().filter(TAExamCourseRecord::getStudentCurrent).count();
+            long totalCurrentCount = taExamCourseRecords.stream().filter(m -> Objects.nonNull(m.getAbsent()) && !m.getAbsent() && Objects.nonNull(m.getStudentCurrent()) && m.getStudentCurrent()).count();
             // 本分数段应届有效人数
             long totalScoreCurrentCount = taExamCourseRecords.stream().filter(m -> m.getStudentCurrent() && m.getAssignedScore().doubleValue() >= startScore && m.getAssignedScore().doubleValue() <= endScore).count();
             Map<String, Object> objectMap = new HashMap<>();
             objectMap.put("scores", String.join(",", str));
             objectMap.put("totalRealityCount", totalRealityCount);
-            objectMap.put("totalRate", totalRealityCount == 0 ? 0 : new BigDecimal(totalScoreCount).divide(new BigDecimal(totalRealityCount), 2, BigDecimal.ROUND_HALF_UP));
+            objectMap.put("totalRate", totalRealityCount == 0 ? 0 : new BigDecimal(totalScoreCount * 100).divide(new BigDecimal(totalRealityCount), 1, BigDecimal.ROUND_HALF_UP));
             objectMap.put("currentRealityCount", totalCurrentCount);
-            objectMap.put("totalRate", totalCurrentCount == 0 ? 0 : new BigDecimal(totalScoreCurrentCount).divide(new BigDecimal(totalCurrentCount), 2, BigDecimal.ROUND_HALF_UP));
+            objectMap.put("currentRate", totalCurrentCount == 0 ? 0 : new BigDecimal(totalScoreCurrentCount * 100).divide(new BigDecimal(totalCurrentCount), 1, BigDecimal.ROUND_HALF_UP));
             mapList.add(objectMap);
         }
         map.put("grades", mapList);

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

@@ -1,17 +1,11 @@
 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.qmth.teachcloud.common.util.ServletUtil;
-import com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseTeacher;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseTeacherMapper;
 import com.qmth.teachcloud.report.business.service.TAExamCourseTeacherService;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * <p>
  * 参考课程授课教师维度表 服务实现类
@@ -23,15 +17,4 @@ import javax.annotation.Resource;
 @Service
 public class TAExamCourseTeacherServiceImpl extends ServiceImpl<TAExamCourseTeacherMapper, TAExamCourseTeacher> implements TAExamCourseTeacherService {
 
-    @Resource
-    TAExamCourseTeacherMapper taExamCourseTeacherMapper;
-
-    @Override
-    public IPage<TAExamCourseTeacher> listTeacherClassRank(String semester, Long examId, String courseCode, Integer pageNumber, Integer pageSize) {
-        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        Page<TAExamCourseTeacher> page = new Page<>(pageNumber, pageSize);
-        IPage<TAExamCourseTeacher> listPage = taExamCourseTeacherMapper.listTeacherClassRank(page, schoolId, semester, examId, courseCode);
-        return listPage;
-    }
-
 }

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

@@ -10,9 +10,9 @@
             a.course_code courseCode,
             a.course_name courseName,
             a.teach_college_name teachCollegeName,
-            a.avg_score avgScore,
-            a.avg_score_assign avgScoreAssign,
-            a.rank
+            round(a.avg_score, 1) avgScore,
+            round(a.avg_score_assign, 1) avgScoreAssign,
+            a.teacher_rank rank
         FROM
             t_a_exam_course_college_teacher a
                 LEFT JOIN
@@ -42,9 +42,9 @@
             a.course_code courseCode,
             a.course_name courseName,
             a.teach_college_name teachCollegeName,
-            a.avg_score avgScore,
+            round(a.avg_score, 1) avgScore,
             a.teacher_count teacherCount,
-            a.rank
+            a.teacher_rank rank
         FROM
             t_a_exam_course_college_teacher a
                 LEFT JOIN
@@ -68,15 +68,15 @@
     </select>
 
     <select id="listAllTeacherClassRank"
-            resultType="com.qmth.teachcloud.report.business.entity.TAExamCourseCollegeTeacher">
+            resultType="com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult">
         SELECT
             a.teach_college_name teachCollegeName,
             a.inspect_college_name inspectCollegeName,
             a.course_code courseCode,
             a.course_name courseName,
             a.teacher_name teacherName,
-            a.avg_score_assign avgScoreAssign,
-            a.rank
+            round(a.avg_score_assign, 1) avgScoreAssign,
+            a.teacher_rank rank
         FROM
             t_a_exam_course_college_teacher a
                 LEFT JOIN
@@ -146,4 +146,28 @@
             </if>
         </where>
     </select>
+    <select id="listTeacherClassRank"
+            resultType="com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult">
+        SELECT
+        a.teach_college_name teachCollegeName,
+        a.teacher_name teacherName,
+        round(a.avg_score_assign, 1) avgScoreAssign,
+        a.teacher_rank rank
+        FROM
+        t_a_exam_course_college_teacher a
+        LEFT JOIN
+        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>
+            <if test="examId != null">
+                and a.exam_id = #{examId}
+            </if>
+            <if test="courseCode != null and courseCode != ''">
+                and a.course_code = #{courseCode}
+            </if>
+        </where>
+    </select>
 </mapper>

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

@@ -75,7 +75,7 @@
             </if>
         </where>
     </select>
-    <select id="getOverview" resultType="com.qmth.teachcloud.report.business.entity.TAExamCourse">
+    <select id="getOverview" resultType="com.qmth.teachcloud.report.business.bean.result.ExamCourseResult">
         SELECT
             b.exam_time examTime,
             a.course_name courseName,
@@ -105,10 +105,10 @@
     </select>
     <select id="getScoreAndRate" resultType="java.util.Map">
         SELECT
-            a.avg_score avgScore,
-            a.current_avg_score currentAvgScore,
-            1 - IFNULL(a.pass_rate, 0) notPassRate,
-            1 - IFNULL(a.current_pass_rate, 0) currentNotPassRate
+            round(a.avg_score, 1) avgScore,
+            round(a.current_avg_score, 1) currentAvgScore,
+            round((1 - IFNULL(a.pass_rate, 0)) * 100 ,1) notPassRate,
+            round((1 - IFNULL(a.current_pass_rate, 0)) * 100, 1) currentNotPassRate
         FROM
             t_a_exam_course a
                 LEFT JOIN

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

@@ -7,12 +7,12 @@
         SELECT
         a.assigned_score assignedScore,
         a.student_code studentCode,
-        a.student_current `current`
+        a.student_current studentCurrent,
+        a.absent
         FROM
         t_a_exam_course_record a
         LEFT JOIN
         t_b_exam b ON a.exam_id = b.id
-        WHERE
         <where>
             and b.school_id = #{schoolId}
             <if test="semester != null and semester != ''">

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

@@ -1,29 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.qmth.teachcloud.report.business.mapper.TAExamCourseTeacherMapper">
-
-    <select id="listTeacherClassRank"
-            resultType="com.qmth.teachcloud.report.business.entity.TAExamCourseTeacher">
-        SELECT
-            a.teach_college_name teachCollegeName,
-            a.teacher_name teacherName,
-            a.avg_score_assign avgScoreAssign,
-            a.rank
-        FROM
-            t_a_exam_course_college_teacher a
-                LEFT JOIN
-            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>
-            <if test="examId != null">
-                and a.exam_id = #{examId}
-            </if>
-            <if test="courseCode != null and courseCode != ''">
-                and a.course_code = #{courseCode}
-            </if>
-        </where>
-    </select>
 </mapper>

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

@@ -39,12 +39,12 @@
             a.reality_count realityCount,
             a.current_reality_count currentRealityCount,
             a.absent_count absentCount,
-            a.avg_score avgScore,
+            round(a.avg_score, 1) avgScore,
             a.pass_count passCount,
-            a.pass_rate passRate,
-            a.current_avg_score currentAvgScore,
+            round(a.pass_rate * 100,1) passRate,
+            round(a.current_avg_score, 1) currentAvgScore,
             a.current_pass_count currentPassCount,
-            a.current_pass_rate currentPassRate
+            round(a.current_pass_rate * 100, 1) currentPassRate
         FROM
             t_a_exam_course a
                 LEFT JOIN

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

@@ -32,9 +32,6 @@ public class DataDriveController {
     @Autowired
     private TAExamCourseService taExamCourseService;
 
-    @Autowired
-    private TAExamCourseTeacherService taExamCourseTeacherService;
-
     @Autowired
     private TAExamCourseCollegeTeacherService taExamCourseCollegeTeacherService;
 
@@ -90,7 +87,7 @@ public class DataDriveController {
                                        @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
                                        @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
                                        @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize) {
-        return ResultUtil.ok(taExamCourseTeacherService.listTeacherClassRank(semester, examId, courseCode, pageNumber, pageSize));
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listTeacherClassRank(semester, examId, courseCode, pageNumber, pageSize));
     }
 
     @ApiOperation(value = "全校课程考试分析-考试概况-导出课程分析报表")
@@ -107,9 +104,9 @@ public class DataDriveController {
     @ApiResponses({@ApiResponse(code = 200, message = "全校课程考试分析-教师各课堂成绩排名", response = TAExamCourseTeacher.class)})
     public Result listAllTeacherClassRank(@ApiParam(value = "学期", required = true) @RequestParam String semester,
                                           @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-                                          @ApiParam(value = "开课学院ID", required = true) @RequestParam Long teachCollegeId,
-                                          @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
-                                          @ApiParam(value = "教师ID", required = true) @RequestParam Long teacherId,
+                                          @ApiParam(value = "开课学院ID", required = true) @RequestParam(required = false) Long teachCollegeId,
+                                          @ApiParam(value = "课程代码", required = true) @RequestParam(required = false) String courseCode,
+                                          @ApiParam(value = "教师ID", required = true) @RequestParam(required = false) Long teacherId,
                                           @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
                                           @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listAllTeacherClassRank(semester, examId, teachCollegeId, courseCode, teacherId, pageNumber, pageSize));

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

@@ -32,7 +32,7 @@ public class StudentReportController {
                              @ApiParam(value = "学院id", required = true) @RequestParam(required = false) String collegeId,
                              @ApiParam(value = "科目编码", required = true) @RequestParam(required = false) String courseCode,
                              @ApiParam(value = "班级id", required = true) @RequestParam(required = false) String clazzId,
-                             @ApiParam(value = "是否缺考", required = true) @RequestParam(required = false) Boolean absent,
+                             @ApiParam(value = "是否缺考", required = true) @RequestParam(required = false) Boolean isAbsent,
                              @ApiParam(value = "学号", required = true) @RequestParam(required = false) String studentCode,
                              @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
                              @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
@@ -41,7 +41,7 @@ public class StudentReportController {
                 SystemConstant.convertIdToLong(collegeId),
                 courseCode,
                 SystemConstant.convertIdToLong(clazzId),
-                absent,studentCode));
+                isAbsent,studentCode));
     }
 
     @ApiOperation(value = "学生报告-个人成绩总览接口")

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

@@ -37,8 +37,8 @@ public class TAExamCourseCollegeTeacherController {
     public Result listClassRank(
             @ApiParam(value = "学期", required = true) @RequestParam String semester,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
-            @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
-            @ApiParam(value = "考查学院ID", required = true) @RequestParam Long inspectCollegeId,
+            @ApiParam(value = "课程代码", required = false) @RequestParam(required = false) String courseCode,
+            @ApiParam(value = "考查学院ID", required = false) @RequestParam(required = false) Long inspectCollegeId,
             @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
             @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize));
@@ -51,8 +51,8 @@ public class TAExamCourseCollegeTeacherController {
             @ApiParam(value = "学期", required = true) @RequestParam String semester,
             @ApiParam(value = "考试ID", required = true) @RequestParam Long examId,
             @ApiParam(value = "教师ID", required = true) @RequestParam Long teacherId,
-            @ApiParam(value = "课程代码", required = true) @RequestParam String courseCode,
-            @ApiParam(value = "考查学院ID", required = true) @RequestParam Long inspectCollegeId,
+            @ApiParam(value = "课程代码", required = false) @RequestParam(required = false) String courseCode,
+            @ApiParam(value = "考查学院ID", required = false) @RequestParam(required = false) Long inspectCollegeId,
             @ApiParam(value = "分页页码", required = true) @RequestParam Integer pageNumber,
             @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize) {
         return ResultUtil.ok(taExamCourseCollegeTeacherService.listMyClassRank(semester, examId, teacherId, courseCode, inspectCollegeId, pageNumber, pageSize));