bug修复

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

@@ -1,8 +1,10 @@
 package com.qmth.teachcloud.report.business.bean.result;
 
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.qmth.teachcloud.common.annotation.ExcelProperty;
 
 import java.io.Serializable;
+import java.util.Objects;
 
 /**
  * @Date: 2021/6/8.
@@ -10,13 +12,26 @@ import java.io.Serializable;
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class TeacherClassRankResult implements Serializable {
 
+    @ExcelProperty(name = "任课老师", width = 30, index = 3)
     private String teacherName;
+
+    @ExcelProperty(name = "考查学院", width = 30, index = 2)
     private String inspectCollegeName;
+
     private String courseCode;
+
     private String courseName;
+
+    @ExcelProperty(name = "开课学院", width = 30, index = 1)
     private String teachCollegeName;
+
+    @ExcelProperty(name = "卷面平均分", width = 30, index = 4)
     private Double avgScore;
+
+    @ExcelProperty(name = "最终平均分", width = 30, index = 5)
     private Double avgScoreAssign;
+
+    @ExcelProperty(name = "考查学院院内排名", width = 50, index = 6)
     private Integer rank;
 
     public String getTeacherName() {

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 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.SemesterEnum;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
@@ -99,7 +100,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @return
      */
-    IPage<TeachCollegeResult> listTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    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);
 
     /**
      * 导入异常考试类型
@@ -125,7 +126,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @throws Exception
      */
-    void exportTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum 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;
 
     /**
      * 考查成绩查询
@@ -143,7 +144,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param order
      * @return
      */
-    IPage<InspectCollegeResult> listInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
+    IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     /**
      * 考查成绩查询-导出查询结果
@@ -158,7 +159,7 @@ public interface TBExamStudentService extends IService<TBExamStudent> {
      * @param column
      * @param order
      */
-    void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
+    void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception;
 
     /**
      * 学生报告预览-列表接口

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

@@ -63,6 +63,9 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
     @Resource
     TAExamCourseService taExamCourseService;
 
+    @Resource
+    TAExamCourseCollegeTeacherService taExamCourseCollegeTeacherService;
+
     /**
      * 开课课程考试总览列表接口
      *
@@ -341,12 +344,15 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
     @Override
     public void courseExport(Long examId, SemesterEnum semester, Long schoolId, String courseCode) throws Exception {
         //成绩对比明细
-        IPage<TeachCollegeResult> teachCollegeResultIPage = tbExamStudentService.listTeachCollegeResult(Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
-        //全校赋分分数段
+        IPage<TeachCollegeResult> teachCollegeResultIPage = tbExamStudentService.listTeachCollegeResult(semester, examId, courseCode, null, null, null, null, SystemConstant.PAGE_NUMBER, SystemConstant.PAGE_SIZE, null, null);
+        //分数段
         GradeDistributeFinalResult gradeDistributeFinalResult = taExamCourseService.getGradeDistribute(semester, examId, courseCode);
+        //各课堂应届生成绩
+        IPage<TeacherClassRankResult> teacherClassRankResultIPage = taExamCourseCollegeTeacherService.listAllTeacherClassRank(semester, 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);
-        List<Collection<?>> collectionList = Arrays.asList(teachCollegeResultIPage.getRecords(), gradeDistributeFinalResult.getPaperGrades(), gradeDistributeFinalResult.getGrades(), gradeDistributeFinalResult.getCurrentAssignedGrades());
+        List<Class<?>> classList = Arrays.asList(TeachCollegeResult.class, GradeDistributePaperResult.class, GradeDistributeResult.class, GradeDistributeCurrentAssignedResult.class, TeacherClassRankResult.class);
+        List<Collection<?>> collectionList = Arrays.asList(teachCollegeResultIPage.getRecords(), gradeDistributeFinalResult.getPaperGrades(), gradeDistributeFinalResult.getGrades(), gradeDistributeFinalResult.getCurrentAssignedGrades(), teacherClassRankResultIPage.getRecords());
         ExcelUtil.excelExportBatchSheet("课程分析", sheetList, classList, collectionList, ServletUtil.getResponse());
     }
 

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

@@ -164,7 +164,7 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     @Override
-    public IPage<TeachCollegeResult> listTeachCollegeResult(String 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(SemesterEnum semester, 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());
@@ -172,9 +172,9 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
         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, semester, examId, courseCode, current, inspectCollegeId, orgId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            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);
         } else {
-            listPage = tbExamStudentMapper.listTeachCollegeResult(new Page<>(pageNumber, pageSize), schoolId, semester, 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, 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);
         }
         return listPage;
     }
@@ -239,29 +239,29 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
     }
 
     @Override
-    public void exportTeachCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
+    public void exportTeachCollegeResult(SemesterEnum semester, 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, semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
+            list = tbExamStudentMapper.listTeachCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            list = tbExamStudentMapper.listTeachCollegeResult(schoolId, semester, 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, 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);
         }
         ExcelUtil.excelExport("开课成绩查询", TeachCollegeResult.class, list, ServletUtil.getResponse());
     }
 
     @Override
-    public IPage<InspectCollegeResult> listInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, String studentParam, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
+    public IPage<InspectCollegeResult> listInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long inspectCollegeId, Long teacherId, 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, semester, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        return tbExamStudentMapper.listInspectCollegeResult(new Page<>(pageNumber, pageSize), schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, inspectCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override
-    public void exportInspectCollegeResult(String semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
+    public void exportInspectCollegeResult(SemesterEnum semester, Long examId, String courseCode, Boolean current, Long teachCollegeId, Long teacherId, String studentParam, String column, OrderEnum order) throws Exception {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
-        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, semester, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
+        List<InspectCollegeResult> list = tbExamStudentMapper.listInspectCollegeResult(schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, current, teachCollegeId, teacherId, studentParam, column, Objects.nonNull(order) ? order.name() : null);
         ExcelUtil.excelExport("考查成绩查询", InspectCollegeResult.class, list, ServletUtil.getResponse());
     }
 

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

@@ -88,7 +88,8 @@
         a.course_name courseName,
         a.teacher_name teacherName,
         round(a.avg_score_assign, 1) avgScoreAssign,
-        a.teacher_rank `rank`
+        a.teacher_rank `rank`,
+        round(a.avg_score, 1) avgScore
         FROM
         t_a_exam_course_college_teacher a
         LEFT JOIN

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

@@ -13,6 +13,7 @@ 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 +49,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 String semester,
+            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
             @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,
@@ -93,7 +94,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 String semester,
+            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
             @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,
@@ -109,7 +110,7 @@ public class TBExamStudentController {
     @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 String semester,
+            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
             @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,
@@ -129,7 +130,7 @@ public class TBExamStudentController {
     @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 String semester,
+            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
             @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,