Merge branch 'master' into inspection

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/MusicGroupPaymentCalenderDao.java

@@ -312,5 +312,5 @@ public interface MusicGroupPaymentCalenderDao extends BaseDAO<Long, MusicGroupPa
      * @param calenderIds
      * @return
      */
-    List<String> queryMusicGroupIds(List<Long> calenderIds);
+    List<String> queryMusicGroupIds(@Param("calenderIds") List<Long> calenderIds);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -2530,7 +2530,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
         userRoleMap.put(directorUserId, "乐队指导");
         userRoleMap.put(educationalTeacherId, "乐团主管");
         userRoleMap.put(teamTeacherId, "运营主管");
-        
+
         classGroups.forEach(e -> {
         	imGroupMemberService.quit(e.getId().longValue(), quitUserIdList);
         	imGroupMemberService.join(e.getId().longValue(), userRoleMap);

mec-biz/src/main/resources/config/mybatis/IndexBaseMonthDataMapper.xml

@@ -318,26 +318,27 @@
 
 	<select id="getOtherStudentData" resultMap="IndexBaseMonthData">
 		SELECT
-			m.organ_id_,
+			su.organ_id_,
 			CONCAT(#{month}, '-01') month_,
 			COUNT( DISTINCT s.user_id_ ) total_num_,
 			COUNT( DISTINCT s.user_id_ ) activate_num_,
 			COUNT( DISTINCT s.user_id_ ) percent_
 		FROM
-			course_schedule_student_payment s
+		    sys_user su
+			LEFT JOIN course_schedule_student_payment s ON su.id_=s.user_id_
 			LEFT JOIN course_schedule m ON s.course_schedule_id_=m.id_
 		WHERE
 			m.del_flag_ = 0
 			AND (m.is_lock_ = 0 OR m.is_lock_ IS NULL)
-			AND m.organ_id_ IS NOT NULL
+			AND su.organ_id_ IS NOT NULL
 			AND m.group_type_ IN ('VIP', 'PRACTICE')
 			<if test="month!=null and month!=''">
 				AND (DATE_FORMAT(m.create_time_, '%Y-%m') &lt;= #{month} OR YEAR(m.create_time_)=3000)
 			</if>
 		GROUP BY
-			m.organ_id_
+			su.organ_id_
 		ORDER BY
-			m.organ_id_;
+			su.organ_id_;
 	</select>
 
 	<select id="getStudentConversionData" resultMap="IndexBaseMonthData">