Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

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

@@ -22,9 +22,9 @@ import java.util.List;
  */
 public interface TAExamCourseCollegeTeacherMapper extends BaseMapper<TAExamCourseCollegeTeacher> {
 
-    IPage<TeacherClassRankResult> listClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("collegeIds") List<Long> collegeIds);
+    IPage<TeacherClassRankResult> listClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
-    IPage<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<TeacherMyClassRankResult> listMyClassRank(@Param("page") Page<TeacherMyClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("teacherId") Long teacherId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId, @Param("column") String column, @Param("order") String order);
 
     IPage<TeacherClassRankResult> listAllTeacherClassRank(@Param("page") Page<TeacherClassRankResult> page, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("inspectCollegeId") Long inspectCollegeId, @Param("courseCode") String courseCode, @Param("teacherId") Long teacherId, @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 

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

@@ -30,10 +30,11 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
      * @param examId
      * @param semester
      * @param schoolId
+     * @param column
+     * @param order
      * @return
      */
-    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId,@Param("collegeId") Long collegeId);
-
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, @Param("examId") Long examId, @Param("semester") String semester, @Param("schoolId") Long schoolId, @Param("collegeId") Long collegeId, @Param("column") String column, @Param("order") String order);
 
     ExamCourseResult getOverview(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
@@ -46,13 +47,15 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
      * @param courseCode
      * @param publishStatus
      * @param collegeIds
+     * @param column
+     * @param order
      * @return
      */
     IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("examId") Long examId,
                                                  @Param("courseCode") String courseCode,
                                                  @Param("publishStatus") String publishStatus,
                                                  @Param("semester") String semester,
-                                                 @Param("collegeIds") List<Long> collegeIds);
+                                                 @Param("collegeIds") List<Long> collegeIds, @Param("column") String column, @Param("order") String order);
 
     Map<String, String> getScoreAndRate(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
 
@@ -64,9 +67,9 @@ public interface TAExamCourseMapper extends BaseMapper<TAExamCourse> {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param column
+     * @param order
      * @return
      */
-    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
-
-    TeachCourseSurveyResult getTeachCourseSurveyInfo(@Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode);
+    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, @Param("schoolId") Long schoolId, @Param("semester") String semester, @Param("examId") Long examId, @Param("courseCode") String courseCode, @Param("column") String column, @Param("order") String order);
 }

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

@@ -21,9 +21,9 @@ import java.util.List;
  */
 public interface TAExamCourseCollegeTeacherService extends IService<TAExamCourseCollegeTeacher> {
 
-    IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize);
+    IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
-    IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize);
+    IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 
     IPage<TeacherClassRankResult> listAllTeacherClassRank(SemesterEnum semester, Long examId, Long inspectCollegeId, String courseCode, Long teacherId, Integer pageNumber, Integer pageSize, String column, OrderEnum order);
 

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.*;
 import com.qmth.teachcloud.report.business.entity.TAExamCourse;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 
@@ -27,9 +28,11 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param examId
      * @param semester
      * @param schoolId
+     * @param column
+     * @param order
      * @return
      */
-    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId);
+    IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId, String column, OrderEnum order);
 
 
     ExamCourseResult getOverview(SemesterEnum semester, Long examId, String courseCode);
@@ -43,9 +46,11 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param courseCode
      * @param publishStatus
      * @param semester
+     * @param column
+     * @param order
      * @return
      */
-    IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester);
+    IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester, String column, OrderEnum order);
 
     Map<String, Object> getGradeDistribute(SemesterEnum semester, Long examId, String courseCode);
 
@@ -79,9 +84,11 @@ public interface TAExamCourseService extends IService<TAExamCourse> {
      * @param semester
      * @param examId
      * @param courseCode
+     * @param column
+     * @param order
      * @return
      */
-    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode);
+    IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode, String column, OrderEnum order);
 
     /**
      * 开课课程考试总览-试题难度得分情况分析接口

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

@@ -39,24 +39,24 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
     SysOrgService sysOrgService;
 
     @Override
-    public IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize) {
+    public IPage<TeacherClassRankResult> listClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         Page<TeacherClassRankResult> page = new Page<>(pageNumber, pageSize);
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, collegeIds);
+            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, Arrays.asList(sysUser.getOrgId()));
+            return taExamCourseCollegeTeacherMapper.listClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, inspectCollegeId, Arrays.asList(sysUser.getOrgId()), column, Objects.nonNull(order) ? order.name() : null);
         }
     }
 
     @Override
-    public IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize) {
+    public IPage<TeacherMyClassRankResult> listMyClassRank(SemesterEnum semester, Long examId, String courseCode, Long inspectCollegeId, Integer pageNumber, Integer pageSize, String column, OrderEnum order) {
         Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<TeacherMyClassRankResult> page = new Page<>(pageNumber, pageSize);
-        IPage<TeacherMyClassRankResult> listPage = taExamCourseCollegeTeacherMapper.listMyClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId);
+        IPage<TeacherMyClassRankResult> listPage = taExamCourseCollegeTeacherMapper.listMyClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
         return listPage;
     }
 

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

@@ -14,6 +14,7 @@ import com.qmth.teachcloud.report.business.entity.TAExamCourse;
 import com.qmth.teachcloud.report.business.entity.TAExamCourseRecord;
 import com.qmth.teachcloud.report.business.entity.TBExam;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.mapper.TAExamCourseMapper;
@@ -66,13 +67,15 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param examId
      * @param semester
      * @param schoolId
+     * @param column
+     * @param order
      * @return
      */
     @Override
-    public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId) {
+    public IPage<TAExamCourseResult> surveyTeacherList(IPage<Map> iPage, Long examId, SemesterEnum semester, Long schoolId, String column, OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Long collegeId = sysUser.getOrgId();
-        return taExamCourseMapper.surveyTeacherList(iPage, examId, Objects.nonNull(semester) ? semester.name() : null, schoolId, collegeId);
+        return taExamCourseMapper.surveyTeacherList(iPage, examId, Objects.nonNull(semester) ? semester.name() : null, schoolId, collegeId, column, Objects.nonNull(order) ? order.name() : null);
     }
 
 
@@ -91,16 +94,18 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param courseCode
      * @param publishStatus
      * @param semester
+     * @param column
+     * @param order
      * @return
      */
     @Override
-    public IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester) {
+    public IPage<TAExamCourseResult> surveyAspointsList(IPage<Map> iPage, Long schoolId, Long examId, String courseCode, PublishStatusEnum publishStatus, SemesterEnum semester, String column, OrderEnum order) {
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         List<Long> collegeIds = sysOrgService.findCollegeIds(sysUser.getOrgId());
         if (Objects.nonNull(collegeIds) && collegeIds.size() > 0) {
-            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null, collegeIds);
+            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null, collegeIds, column, Objects.nonNull(order) ? order.name() : null);
         } else {
-            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null, Arrays.asList(sysUser.getOrgId()));
+            return taExamCourseMapper.surveyAspointsList(iPage, schoolId, examId, courseCode, Objects.nonNull(publishStatus) ? publishStatus.name() : null, Objects.nonNull(semester) ? semester.name() : null, Arrays.asList(sysUser.getOrgId()), column, Objects.nonNull(order) ? order.name() : null);
         }
     }
 
@@ -187,7 +192,7 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
         List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = reportCommonService.surveyTeacherDistribution(examId, courseCode, sysUser.getOrgId());
         //查找题目信息
         QuestionListResult questionListResult = reportCommonService.findQuestionInfo(examId, courseCode, sysUser.getOrgId());
-        return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, questionListResult, surveyTeacherExamCourseResult,teachCourseSurveyResult);
+        return new SurveyTeacherViewResult(surveyTeacherGradeDistributionResultList, questionListResult, surveyTeacherExamCourseResult, teachCourseSurveyResult);
     }
 
     /**
@@ -198,11 +203,13 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
      * @param semester
      * @param examId
      * @param courseCode
+     * @param column
+     * @param order
      * @return
      */
     @Override
-    public IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode) {
-        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode);
+    public IPage<TAExamCourseCollegeTeacherResult> surveyTeacherTeacherView(IPage<Map> iPage, Long schoolId, SemesterEnum semester, Long examId, String courseCode, String column, OrderEnum order) {
+        return taExamCourseMapper.surveyTeacherTeacherView(iPage, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, courseCode, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     /**
@@ -326,15 +333,16 @@ public class TAExamCourseServiceImpl extends ServiceImpl<TAExamCourseMapper, TAE
 
     /**
      * 获取开课课程考试课程总览
-     * @param semester 学期
-     * @param examId 考试id
+     *
+     * @param semester   学期
+     * @param examId     考试id
      * @param courseCode 课程编号
      * @return 结果
      */
     private TeachCourseSurveyResult getTeachCourseSurveyInfo(SemesterEnum semester, Long examId, String courseCode) {
         TBExam tbExam = tbExamService.getById(examId);
 
-        TAExamCourse taExamCourse = this.getOne(new QueryWrapper<TAExamCourse>().lambda().eq(TAExamCourse::getExamId,examId).eq(TAExamCourse::getCourseCode,courseCode));
+        TAExamCourse taExamCourse = this.getOne(new QueryWrapper<TAExamCourse>().lambda().eq(TAExamCourse::getExamId, examId).eq(TAExamCourse::getCourseCode, courseCode));
         TeachCourseSurveyResult teachCourseSurveyResult = new TeachCourseSurveyResult();
         teachCourseSurveyResult.setExamTime(tbExam.getExamTime());
         teachCourseSurveyResult.setCourseCode(taExamCourse.getCourseCode());

teachcloud-report-business/src/main/java/com/qmth/teachcloud/report/business/templete/test.java

@@ -1,9 +0,0 @@
-package com.qmth.teachcloud.report.business.templete;
-
-/**
- * @Description:
- * @Author: CaoZixuan
- * @Date:
- */
-public class test {
-}

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

@@ -4,7 +4,7 @@
 
     <select id="listClassRank"
             resultType="com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult">
-        SELECT
+        select * from(SELECT
             a.teacher_name teacherName,
             a.inspect_college_name inspectCollegeName,
             a.course_code courseCode,
@@ -37,12 +37,15 @@
                     #{collegeId}
                 </foreach>
             </if>
-        </where>
+        </where> ) t
+            <if test="column != null and column != '' and order != null and order != ''">
+                order by t.${column} ${order}
+            </if>
     </select>
 
     <select id="listMyClassRank"
             resultType="com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult">
-        SELECT
+        select * from(SELECT
             a.teacher_name teacherName,
             a.inspect_college_name inspectCollegeName,
             a.course_code courseCode,
@@ -70,7 +73,10 @@
             <if test="inspectCollegeId != null">
                 and a.inspect_college_id = #{inspectCollegeId}
             </if>
-        </where>
+        </where> ) t
+        <if test="column != null and column != '' and order != null and order != ''">
+            order by t.${column} ${order}
+        </if>
     </select>
 
     <select id="listAllTeacherClassRank"

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

@@ -45,21 +45,24 @@
     </sql>
 
     <select id="surveyTeacherList" resultType="com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult">
-        <include refid="commonHead" />
-        <include refid="commonMiddle" />
+        select * from(<include refid="commonHead"/>
+        <include refid="commonMiddle"/>
         <where>
-            <include refid="commonCondition" />
+            <include refid="commonCondition"/>
             <if test="semester != null and semester != ''">
                 and tbe.semester = #{semester}
             </if>
             <if test="collegeId != null and collegeId != ''">
                 and taec.teach_college_id = #{collegeId}
             </if>
-        </where>
+        </where> ) t
+        <if test="column != null and column != '' and order != null and order != ''">
+            order by t.${column} ${order}
+        </if>
     </select>
 
     <select id="surveyAspointsList" resultType="com.qmth.teachcloud.report.business.bean.result.TAExamCourseResult">
-        <include refid="commonHead" />
+        select * from(<include refid="commonHead" />
         ,tbec.publish_status as status
         <include refid="commonMiddle" />
         join t_b_exam_course tbec
@@ -82,7 +85,10 @@
                     #{collegeId}
                 </foreach>
             </if>
-        </where>
+        </where> ) t
+        <if test="column != null and column != '' and order != null and order != ''">
+            order by t.${column} ${order}
+        </if>
     </select>
 
     <select id="getOverview" resultType="com.qmth.teachcloud.report.business.bean.result.ExamCourseResult">
@@ -140,7 +146,7 @@
     </select>
 
     <select id="surveyTeacherTeacherView" resultType="com.qmth.teachcloud.report.business.bean.result.TAExamCourseCollegeTeacherResult">
-        select
+        select * from(select
             taecct.inspect_college_name as inspectCollegeName,
             taecct.teacher_name as teacherName,
             taecct.avg_score as currentAvgScoreBefore,
@@ -158,25 +164,9 @@
             <if test="courseCode != null and courseCode != ''">
                 and taecct.course_code = #{courseCode}
             </if>
-        </where>
-        order by taecct.inspect_college_name
+        </where> ) t
+        <if test="column != null and column != '' and order != null and order != ''">
+            order by t.${column} ${order}
+        </if>
     </select>
-<!--    <select id="getTeachCourseSurveyInfo"-->
-<!--            resultType="com.qmth.teachcloud.report.business.bean.result.TeachCourseSurveyResult">-->
-
-<!--        <where>-->
-<!--            <if test="schoolId != null">-->
-<!--                and b.school_id = #{schoolId}-->
-<!--            </if>-->
-<!--            <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/src/main/java/com/qmth/teachcloud/report/api/CourseController.java

@@ -15,6 +15,7 @@ import com.qmth.teachcloud.report.business.bean.result.*;
 import com.qmth.teachcloud.report.business.bean.result.inspectCourseExamTotal.InspectCourseTotalReportResult;
 import com.qmth.teachcloud.report.business.entity.TBExamCourse;
 import com.qmth.teachcloud.report.business.entity.TBPaper;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.PublishStatusEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.*;
@@ -51,9 +52,6 @@ public class CourseController {
     @Resource
     AsyncDataCalculateTempleteService asyncDataCalculateTempleteService;
 
-    @Resource
-    TBExamCourseService tbExamCourseService;
-
     @Resource
     TBPaperService tbPaperService;
 
@@ -64,8 +62,10 @@ public class CourseController {
                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                     @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId)));
+                                    @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
+                                    @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
+                                    @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
+        return ResultUtil.ok(taExamCourseService.surveyTeacherList(new Page<>(pageNumber, pageSize), SystemConstant.convertIdToLong(examId), semester, Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), column, order));
     }
 
     @ApiOperation(value = "开课课程考试总览-教师各课堂成绩排名接口")
@@ -76,8 +76,10 @@ public class CourseController {
                                            @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), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+                                           @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
+                                           @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
+                                           @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
+        return ResultUtil.ok(taExamCourseService.surveyTeacherTeacherView(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, column, order));
     }
 
     @ApiOperation(value = "开课课程考试总览-试题难度得分情况分析接口")
@@ -93,7 +95,7 @@ public class CourseController {
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
     }
 
     @ApiOperation(value = "开课课程考试总览-各难度水平题目上的作答分析接口")
@@ -109,7 +111,7 @@ public class CourseController {
         if (Objects.isNull(sysUser)) {
             throw ExceptionResultEnum.NOT_LOGIN.exception();
         }
-        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherQuestionAnswerView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode, Objects.nonNull(collegeId) ? SystemConstant.convertIdToLong(collegeId) : sysUser.getOrgId(), Objects.nonNull(teacherId) ? SystemConstant.convertIdToLong(teacherId) : null));
     }
 
     @ApiOperation(value = "开课课程考试总览图表接口")
@@ -119,7 +121,7 @@ public class CourseController {
                                     @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                     @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId,
                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode) {
-        return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(taExamCourseService.surveyTeacherView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
     }
 
     @ApiOperation(value = "考查课程考试总览-公共课概况接口")
@@ -140,7 +142,7 @@ public class CourseController {
                                            @ApiParam(value = "学期", required = true) @RequestParam SemesterEnum semester,
                                            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
                                            @ApiParam(value = "学校id", required = false) @RequestParam(required = false) String schoolId) {
-        return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
+        return ResultUtil.ok(taExamCourseService.surveyInspectAnalyseView(Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), semester, SystemConstant.convertIdToLong(examId), courseCode));
     }
 
     @ApiOperation(value = "赋分管理列表接口")
@@ -152,18 +154,20 @@ public class CourseController {
                                      @ApiParam(value = "科目编码", required = false) @RequestParam(required = false) String courseCode,
                                      @ApiParam(value = "发布状态", required = false) @RequestParam(required = false) PublishStatusEnum publishStatus,
                                      @ApiParam(value = "分页页码", required = true) @RequestParam int pageNumber,
-                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize) {
-        return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId()))  : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester));
+                                     @ApiParam(value = "分页数", required = true) @RequestParam int pageSize,
+                                     @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
+                                     @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
+        return ResultUtil.ok(taExamCourseService.surveyAspointsList(new Page<>(pageNumber, pageSize), Objects.isNull(schoolId) ? SystemConstant.convertIdToLong(String.valueOf(ServletUtil.getRequestHeaderSchoolId())) : SystemConstant.convertIdToLong(schoolId), SystemConstant.convertIdToLong(examId), courseCode, publishStatus, semester, column, order));
     }
 
     @ApiOperation(value = "赋分试算接口")
     @RequestMapping(value = "/survey_aspoints/calculation", method = RequestMethod.POST)
     @ApiResponses({@ApiResponse(code = 200, message = "赋分试算接口", response = TrialCalculationResult.class)})
     public Result surveyAspointsCalculation(
-                                     @ApiParam(value = "考试id", required = true) @RequestParam String examId,
-                                     @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
-                                     @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
-        return ResultUtil.ok(taExamCourseService.trialCalculate(SystemConstant.convertIdToLong(examId),courseCode,coefficient));
+            @ApiParam(value = "考试id", required = true) @RequestParam String examId,
+            @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
+            @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
+        return ResultUtil.ok(taExamCourseService.trialCalculate(SystemConstant.convertIdToLong(examId), courseCode, coefficient));
     }
 
     @ApiOperation(value = "赋分管理-发布&撤回接口")
@@ -174,7 +178,7 @@ public class CourseController {
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
             @ApiParam(value = "发布状态", required = true) @RequestParam PublishStatusEnum publishStatus) {
 
-        analyzeForReportService.publishReport(SystemConstant.convertIdToLong(examId),courseCode,publishStatus);
+        analyzeForReportService.publishReport(SystemConstant.convertIdToLong(examId), courseCode, publishStatus);
         return ResultUtil.ok();
     }
 
@@ -185,9 +189,9 @@ public class CourseController {
             @ApiParam(value = "考试id", required = true) @RequestParam String examId,
             @ApiParam(value = "科目编码", required = true) @RequestParam String courseCode,
             @ApiParam(value = "赋分系数", required = true) @RequestParam BigDecimal coefficient) {
-        if (coefficient.compareTo(BigDecimal.ZERO) != 0){
+        if (coefficient.compareTo(BigDecimal.ZERO) != 0) {
             List<TBPaper> tbPaperList = tbPaperService.list(new QueryWrapper<TBPaper>().lambda()
-                    .eq(TBPaper::getExamId,examId).eq(TBPaper::getCourseCode,courseCode));
+                    .eq(TBPaper::getExamId, examId).eq(TBPaper::getCourseCode, courseCode));
 
             for (TBPaper tbPaper : tbPaperList) {
                 tbPaper.setCoefficient(coefficient);
@@ -195,8 +199,8 @@ public class CourseController {
             tbPaperService.updateBatchById(tbPaperList);
 
             Map<String, Object> map = tbTaskService.saveTask(TaskTypeEnum.DATA_CALCULATE);
-            map.put("examId",examId);
-            map.put("courseCode",courseCode);
+            map.put("examId", examId);
+            map.put("courseCode", courseCode);
             asyncDataCalculateTempleteService.calculateTask(map);
         }
         return ResultUtil.ok();

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

@@ -7,6 +7,7 @@ import com.qmth.teachcloud.common.util.ResultUtil;
 import com.qmth.teachcloud.report.business.bean.result.TBExamStudentResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherClassRankResult;
 import com.qmth.teachcloud.report.business.bean.result.TeacherMyClassRankResult;
+import com.qmth.teachcloud.report.business.enums.OrderEnum;
 import com.qmth.teachcloud.report.business.enums.SemesterEnum;
 import com.qmth.teachcloud.report.business.service.TAExamCourseCollegeTeacherService;
 import io.swagger.annotations.*;
@@ -41,8 +42,10 @@ public class TAExamCourseCollegeTeacherController {
             @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));
+            @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
+            @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
     }
 
     @ApiOperation(value = "我的课堂考成绩排名")
@@ -54,7 +57,9 @@ public class TAExamCourseCollegeTeacherController {
             @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, courseCode, inspectCollegeId, pageNumber, pageSize));
+            @ApiParam(value = "分页数量", required = true) @RequestParam Integer pageSize,
+            @ApiParam(value = "排序列", required = false) @RequestParam(required = false) String column,
+            @ApiParam(value = "排序规则", required = false) @RequestParam(required = false) OrderEnum order) {
+        return ResultUtil.ok(taExamCourseCollegeTeacherService.listMyClassRank(semester, examId, courseCode, inspectCollegeId, pageNumber, pageSize, column, order));
     }
 }

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

@@ -57,7 +57,7 @@ sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/w
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=true
+sys.config.customThreadPoolCoreSize=false
 sys.config.reportUrl=http://localhost:7004/#/student-report/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/
 

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

@@ -55,7 +55,7 @@ sys.config.adminLogoUrl=http://qmth-test.oss-cn-shenzhen.aliyuncs.com/frontend/w
 #sys.config.htmlToPdfUrl=/usr/local/bin/wkhtmltopdf
 #sys.config.autoCreatePdfResetMaxCount=5
 sys.config.threadPoolCoreSize=1
-sys.config.customThreadPoolCoreSize=true
+sys.config.customThreadPoolCoreSize=false
 sys.config.reportUrl=http://192.168.10.136:7005/#/student-report/
 spring.resources.static-locations=file:${sys.config.serverUpload},classpath:/META-INF/resources/,classpath:/resources/