zouxuan 3 роки тому
батько
коміт
53c31617b2

+ 25 - 6
mec-biz/src/main/resources/config/mybatis/StudentRegistrationMapper.xml

@@ -1743,11 +1743,12 @@
         LEFT JOIN sys_user su  ON sr.user_id_ = su.id_
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
         -- 新用户
-        WHERE su.id_ NOT IN (SELECT DISTINCT(cssp.`user_id_`)  FROM `course_schedule_student_payment` cssp
-        LEFT JOIN course_schedule cs on cssp.`course_schedule_id_` = cs.`id_`
-        LEFT JOIN `music_group` mg on mg.`id_` = cssp.`music_group_id_`
-        WHERE cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND mg.`status_` = 'PROGRESS'
-        GROUP BY cssp.`user_id_` HAVING COUNT(cs.`id_`) <= 4)
+        WHERE su.id_ NOT IN (SELECT DISTINCT(sr.`user_id_`) FROM student_registration sr
+        LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
+        LEFT JOIN course_schedule cs on cs.`music_group_id_` = mg.`id_` AND cs.`group_type_` = 'MUSIC' AND cs.`status_` = 'OVER' AND cs.del_flag_ = 0
+        LEFT JOIN `course_schedule_student_payment` cssp on cssp.`course_schedule_id_` = cs.`id_`
+        WHERE mg.`status_` = 'PROGRESS' AND sr.music_group_status_ = 'NORMAL'
+        GROUP BY sr.`user_id_` HAVING COUNT(cs.`id_`) <= 4)
         -- 			非管乐
         AND su.id_ NOT IN (SELECT user_id_ FROM student WHERE subject_id_list_ REGEXP '21|25|26|27|28|29')
         -- 			声部排除
@@ -1757,7 +1758,25 @@
         -- 			未退团,不是会员团
         AND su.id_ NOT IN (SELECT DISTINCT sr.user_id_ FROM student_registration sr
         LEFT JOIN music_group mg ON mg.id_ = sr.music_group_id_
-        WHERE sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 2)
+        WHERE sr.music_group_status_ != 'QUIT' AND mg.course_view_type_ = 2 AND mg.status_ NOT IN ('CANCELED','CLOSE'))
+        -- 去掉部分非目标学员
+        AND mg.id_ NOT IN ('21062318002900001','20792','21082414270900001','21060314253100001')
+        -- 去掉部分非目标学员
+        AND sr.user_id_ NOT IN (2127770,2127771,2127772,2127773,2127774,2127775,2127776,2127777,
+                              2127778,2127779,2127780,2127781,2127782,2127783,2127784,2127785,2127786,2127787,2127788,
+                              2127789,2127790,2127791,2127792,2127793,2127794,2127795,2127796,2127797,2127798,2127799,
+                              2127800,2127801,2127802,2127803,2127804,2127805,2127806,2127807,2127808,2127809,2127810,
+                              2127811,2127812,2127813,2127814,2127815,2127816,2127817,
+                              2122083,2122084,2122085,2122088,2122090,2122092,2122399,2122567,2122577,2122584,2122847,
+                              2122892,2122893,2122894,2122896,2122898,2122899,2122901,2122902,2122903,2122951,2122953,
+                              2122958,2122962,2122964,2122965,2123157,2123169,2123176,2123187,2123190,2123192,2123201,
+                              2123232,2123304,2125139,2125142,2125145,2125147,2125148,2125151,2125152,2125165,2125168,2125197,2125198,
+                              2132340,2132341,2132342,2132343,2132344,2132345,2132347,2132348,2132349,2132350,2132351,2132352,2132353,
+                              2132354,2132355,2132356,2132357,2132362,2132365,2132366,2132368,2132374,2132375,2132377,2132386,2132387,
+                              2132388,2132390,2132391,2132392,2132394,2132395,2132396,2132400,2132401,2132403,2132405,2132407,2132408,
+                              2132411,2132413,2132414,2132415,2132417,2132418,2132419,2132423,2132424,2132425,2132431,2132434,2132435,
+                              2132436,2132437,2132438,2132440,2132441,2132443,2132444,2132445,2132446,2132447,2132448,2132449,2132452,
+                              2132454,2132457,2132459,2132461,2135865)
 
         AND sr.music_group_status_ = 'NORMAL' AND mg.course_view_type_ != 2 AND mg.`status_` = 'PROGRESS'
         GROUP BY su.organ_id_