Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/MusicSheetServiceImpl.java

@@ -440,6 +440,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         detailVo.setShowFingering(musicSheet1.getIsShowFingering() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
         detailVo.setMusicTag(musicSheet1.getMusicTag());
         detailVo.setMusicTagNames(musicSheet1.getMusicTagNames());
+        detailVo.setMusicImg(musicSheet1.getMusicImg());
+        detailVo.setTitleImg(musicSheet1.getMusicCover());
         List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheet1.getMusicSheetAccompanimentList();
         if (CollectionUtils.isNotEmpty(accompanimentList)) {
             detailVo.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
@@ -774,6 +776,8 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         record.setFirstTone(musicSheetApplication.getMusicFirstImg());
         record.setFixedTone(musicSheetApplication.getMusicJianImg());
         record.setMusicSheetExtend(musicSheetApplication.getMusicSheetExtend());
+        record.setMusicImg(musicSheetApplication.getMusicImg());
+        record.setTitleImg(musicSheetApplication.getMusicCover());
     }
 
 

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

@@ -97,7 +97,7 @@
     <insert id="batchInsert">
         insert into music_sheet
         (cbs_music_sheet_id_,provider_type_,music_tag_,payment_type_,charge_type_,top_flag_,exquisite_flag_,sort_number_,state_,audit_status_
-            ,music_sheet_name_,music_subject_,music_svg_,composer_,title_img_,music_img_,accompaniment_type_,play_speed_,
+            ,music_sheet_name_,music_subject_,music_svg_,composer_,accompaniment_type_,play_speed_,
          music_price_,notation_,music_sheet_type_,source_type_,audio_type_,show_fingering_,can_evaluate_,create_by_,user_id_
         )
         values
@@ -111,8 +111,6 @@
             #{item.musicSheetUpdate.subjectIds},
             #{item.musicSheetUpdate.musicSvg},
             #{item.musicSheetUpdate.composer},
-            #{item.musicSheetUpdate.musicCover},
-            #{item.musicSheetUpdate.musicCover},
             #{item.musicSheetUpdate.audioType},
             #{item.musicSheetUpdate.playSpeed},
             #{item.musicSheetUpdate.musicPrice},
@@ -840,14 +838,13 @@
             ms.charge_type_ = #{item.paymentType},
             ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
             ms.exquisite_flag_ = #{item.exquisiteFlag},ms.sort_number_ = #{item.sortNo},ms.del_flag_ = 0,
-            ms.audit_status_ = CASE WHEN #{item.delFlag} THEN 'PASS' ELSE 'DOING' END
+            ms.audit_status_ = CASE WHEN #{item.delFlag} THEN 'PASS' ELSE 'DOING' END,
+            ms.state_ = #{item.status}
             <if test="item.musicSheetUpdate != null">
                 ,ms.music_sheet_name_ = #{item.musicSheetUpdate.name},
                 ms.music_subject_ = #{item.musicSheetUpdate.subjectIds},
                 ms.music_svg_ = #{item.musicSheetUpdate.musicSvg},
                 ms.composer_ = #{item.musicSheetUpdate.composer},
-                ms.title_img_ = #{item.musicSheetUpdate.musicCover},
-                ms.music_img_ = #{item.musicSheetUpdate.musicCover},
                 ms.accompaniment_type_ = #{item.musicSheetUpdate.audioType},
                 ms.play_speed_ = #{item.musicSheetUpdate.playSpeed},
                 ms.music_price_ = #{item.musicSheetUpdate.musicPrice},

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

@@ -36,7 +36,7 @@
                 <if test="type == null or type =='MUSIC'">
                     union all
                     (select a.music_subject_ as subject_id_ from music_sheet a
-                    where a.del_flag_ = 0 and a.state_ = 1
+                    where a.del_flag_ = 0 and a.state_ = 1 a.cbs_music_sheet_id_ IS NOT NULL
                     GROUP BY a.music_subject_)
                 </if>
                 <if test="type == null or type =='ALBUM'">
@@ -70,7 +70,7 @@
             </trim>
             ) a group by a.subject_id_
         ) a on t.id_ = a.subject_id_
-        where t.parent_subject_id_ != 0
+        where t.parent_subject_id_ != 0 group by t.id_
     </select>
 
     <!-- 向数据库增加一条记录 -->