Merge branch 'dev_v2.1.0' into release_v2.1.0

merge

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

@@ -240,6 +240,9 @@ public class ReportCommonServiceImpl implements ReportCommonService {
     public List<SurveyTeacherGradeDistributionResult> surveyTeacherDistribution(Long examId, String courseCode, Long collegeId, boolean filter) {
         List<SurveyTeacherGradeDistributionResult> surveyTeacherGradeDistributionResultList = new ArrayList<>();
         List<SurveyTeacherDistributionResult> surveyTeacherDistributionResultList = taExamCourseRecordService.surveyTeacherDistribution(examId, courseCode, filter);
+        if (Objects.isNull(surveyTeacherDistributionResultList) && surveyTeacherDistributionResultList.size() > 0) {
+            return null;
+        }
         surveyTeacherDistributionResultList = surveyTeacherDistributionResultList.stream().filter(e -> !e.getAbsent()).collect(Collectors.toList());
         //过滤应届
         List<SurveyTeacherDistributionResult> currentDistributionResultList = surveyTeacherDistributionResultList.stream().filter(e -> e.getStudentCurrent() == true && !e.getAbsent()).collect(Collectors.toList());

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

@@ -65,9 +65,12 @@
             t_a_exam_course_college_teacher a
                 LEFT JOIN
             t_b_exam b ON a.exam_id = b.id
+                LEFT JOIN
+            t_b_exam_course c ON a.exam_id = c.exam_id and a.course_code = c.course_code
         <where>
             and b.school_id = #{schoolId}
             and a.teacher_id = #{teacherId}
+            and c.publish_status = 'PUBLISH'
             <if test="semester != null and semester != ''">
                 and b.semester = #{semester}
             </if>