Merge remote-tracking branch 'origin/ljc_piano_rule' into ljc_piano_rule

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseScheduleRecordMapper.xml

@@ -28,7 +28,7 @@
     <select id="selectConsumeTimeList" resultType="com.yonge.cooleshow.biz.dal.vo.CourseScheduleRecordVo">
         SELECT
             s.id_ AS courseId,
-            g.name_ AS groupName,
+            CONCAT(g.name_,'-第',s.class_num_,'课') AS groupName,
             g.subject_id_ AS subjectId,
             sb.name_ AS subjectName,
             s.status_ AS `status`,
@@ -73,7 +73,7 @@
         s.end_time_ AS endTime,
         s.single_course_time_ AS singleCourseTime,
         a.count_ AS studentCount,
-        (CASE WHEN s.status_ = 'NOT_START' THEN 0 ELSE ( a.count_ + 1 )*(a.count_)* s.single_course_time_ END) AS consumTime,
+        (CASE WHEN s.status_ = 'NOT_START' THEN 0 ELSE (a.count_)* s.single_course_time_ END) AS consumTime,
         i.id_ AS imGroupId
         FROM course_schedule s
         LEFT JOIN course_group g ON s.course_group_id_ = g.id_

cooleshow-user/user-biz/src/main/resources/config/mybatis/MusicAlbumMapper.xml

@@ -44,15 +44,14 @@
             where find_in_set(mt.id_,t.album_tag_) and mt.del_flag_ = 0 and mt.state_ = 1) as musicTagNames
         ,(select group_concat(s.name_) from subject s
         where find_in_set(s.id_,t.subject_id_) and s.del_flag_ = 0 ) as subjectNames
-        , t1.num as musicSheetCount
-        ,t2.num as albumFavoriteCount
-        from music_album t
-        left join (select count(1) as num,amr.album_id_
+        ,(select count(1) as num
             from album_music_relate amr
             join music_sheet ms on amr.music_sheet_id_ = ms.id_
             left join sys_user su on su.id_ = ms.user_id_
             where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and su.del_flag_ = 0
-        group by amr.album_id_) t1 on t1.album_id_ = t.id_
+            and amr.album_id_ = t.id_) as musicSheetCount
+        ,t2.num as albumFavoriteCount
+        from music_album t
         left join (select count(1) as num,af.album_id_ from album_favorite af
             left join sys_user su on af.user_id_ = su.id_
             where su.del_flag_ = 0 group by af.album_id_