Merge remote-tracking branch 'origin/dev_v2.1.0' into dev_v2.1.0

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

@@ -91,7 +91,7 @@ public interface TBExamStudentMapper extends BaseMapper<TBExamStudent> {
      * @param courseCode
      * @return
      */
-    List<TBExamStudentResult> selectClassList(@Param("schoolId") Long schoolId, @Param("examId") Long examId,@Param("teacherId") Long teacherId, @Param("courseCode") String courseCode);
+    List<TBExamStudentResult> selectClassList(@Param("schoolId") Long schoolId, @Param("examId") Long examId,@Param("teacherId") Long teacherId, @Param("courseCode") String courseCode, @Param("inspectCollegeId") Long inspectCollegeId);
 
     /**
      * 开课成绩查询

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

@@ -180,7 +180,9 @@ public class TBExamStudentServiceImpl extends ServiceImpl<TBExamStudentMapper, T
      */
     @Override
     public List<TBExamStudentResult> selectClassList(Long schoolId, Long examId,Long teacherId, String courseCode) {
-        return tbExamStudentMapper.selectClassList(schoolId, examId, teacherId, courseCode);
+        SysUser sysUser = (SysUser) ServletUtil.getRequestUser();
+        Long orgId = sysUser.getOrgId();
+        return tbExamStudentMapper.selectClassList(schoolId, examId, teacherId, courseCode, orgId);
     }
 
     @Override

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

@@ -130,6 +130,9 @@
             <if test="teacherId != null and teacherId != ''">
                 and tbes.teacher_id = #{teacherId}
             </if>
+            <if test="inspectCollegeId != null and teacherId != ''">
+                and tbes.inspect_college_id = #{inspectCollegeId}
+            </if>
         </where>
     </select>