新增我的考试分析

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

@@ -65,10 +65,10 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
 
     @Override
     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());
+        Long schoolId = Long.valueOf(ServletUtil.getRequestHeaderSchoolId().toString());
         SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
         Page<TeacherMyClassRankResult> page = new Page<>(pageNumber, pageSize);
-        return taExamCourseCollegeTeacherMapper.listMyClassRank(page, 2L, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
+        return taExamCourseCollegeTeacherMapper.listMyClassRank(page, schoolId, Objects.nonNull(semester) ? semester.name() : null, examId, sysUser.getId(), courseCode, inspectCollegeId, column, Objects.nonNull(order) ? order.name() : null);
     }
 
     @Override
@@ -122,7 +122,12 @@ public class TAExamCourseCollegeTeacherServiceImpl extends ServiceImpl<TAExamCou
         }
         // 考试概况
         TAExamCourseCollegeInspectResult taExamCourseCollegeInspectResult = taExamCourseCollegeInspectService.findTeacherInspect(sysUser.getSchoolId(), semester, examId, courseCode, inspectCollegeId);
-        TeachCourseResult teachCourseResultFinal = new TeachCourseResult(taExamCourseCollegeInspectResult);
+        TeachCourseResult teachCourseResultFinal = null;
+        if (Objects.nonNull(taExamCourseCollegeInspectResult)) {
+            teachCourseResultFinal = new TeachCourseResult(taExamCourseCollegeInspectResult);
+        } else {
+            teachCourseResultFinal = new TeachCourseResult();
+        }
         List<TeachCourseResult> teachCourseResultList = taExamCourseRecordService.findTeacherInspect(sysUser.getSchoolId(), semester, examId, courseCode, inspectCollegeId, sysUser.getId());
         if (Objects.nonNull(teachCourseResultList) && teachCourseResultList.size() > 0) {
             for (TeachCourseResult t : teachCourseResultList) {

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

@@ -165,7 +165,7 @@
             tbe.id = taecr.exam_id
         <where>
             <if test="inspectCollegeId != null and inspectCollegeId != ''">
-                AND taecr.inspect_college_id = #{examId}
+                AND taecr.inspect_college_id = #{inspectCollegeId}
             </if>
             <if test="examId != null and examId != ''">
                 AND taecr.exam_id = #{examId}
@@ -179,6 +179,9 @@
             <if test="courseCode != null and courseCode != ''">
                 AND taecr.course_code = #{courseCode}
             </if>
+            <if test="teacherId != null and teacherId != ''">
+                AND taecr.teacher_id = #{teacherId}
+            </if>
         </where>
         group by
             taecr.absent