zouxuan 3 лет назад
Родитель
Сommit
ad143401d1
1 измененных файлов с 4 добавлено и 3 удалено
  1. 4 3
      mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

+ 4 - 3
mec-biz/src/main/resources/config/mybatis/MusicGroupMapper.xml

@@ -1102,10 +1102,10 @@
         mg.group_member_num_,
         COUNT(DISTINCT CASE WHEN sr.original_flag_ = 0 AND sr.music_group_status_ = 'NORMAL' THEN sr.id_ ELSE NULL END) add_stu_num_,
         COUNT(DISTINCT CASE WHEN mgq.status_ = 'APPROVED' THEN mgq.apply_user_id_ ELSE NULL END) quit_stu_num_,
-        COUNT(DISTINCT CASE WHEN sr.music_group_status_ = 'NORMAL' THEN sr.id_ ELSE NULL END) normal_num_,
-        COUNT(DISTINCT CASE WHEN sr.music_group_status_ != 'APPLY' THEN sr.id_ ELSE NULL END) total_num_,
+        COUNT(DISTINCT CASE WHEN sr1.music_group_status_ = 'NORMAL' THEN sr1.id_ ELSE NULL END) normal_num_,
+        COUNT(DISTINCT CASE WHEN sr1.music_group_status_ != 'APPLY' THEN sr1.id_ ELSE NULL END) total_num_,
         CONCAT(TRUNCATE(COUNT(DISTINCT CASE WHEN mgq.status_ = 'APPROVED' THEN mgq.apply_user_id_ ELSE NULL END) /
-        COUNT(DISTINCT CASE WHEN sr.music_group_status_ != 'APPLY' THEN sr.id_ ELSE NULL END) * 100,2),'%') lost_rate_
+        COUNT(DISTINCT CASE WHEN sr1.music_group_status_ != 'APPLY' THEN sr1.id_ ELSE NULL END) * 100,2),'%') lost_rate_
         FROM music_group mg
         LEFT JOIN course_schedule_statistics css ON mg.id_ = css.music_group_id_ AND css.course_status_ = 'OVER'
         <if test="queryInfo.startTime != null and queryInfo.startTime != ''">
@@ -1113,6 +1113,7 @@
         </if>
         LEFT JOIN organization o ON o.id_ = mg.organ_id_
         LEFT JOIN sys_user su ON su.id_ = mg.educational_teacher_id_
+        LEFT JOIN student_registration sr1 ON sr1.music_group_id_ = mg.id_
         LEFT JOIN student_registration sr ON sr.music_group_id_ = mg.id_
         <if test="queryInfo.startTime != null and queryInfo.startTime != ''">
             AND DATE_FORMAT(sr.create_time_,"%Y-%m-%d") BETWEEN #{queryInfo.startTime} AND #{queryInfo.endTime}