酷乐秀曲目来源改为内容平台

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

@@ -286,6 +286,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (StringUtils.isNotEmpty(musicSheetApplication.getPlaySpeed())) {
             sheet.setPlaySpeed(musicSheetApplication.getPlaySpeed());
         }
+        if (musicSheetApplication.getIsConvertibleScore() != null){
+            sheet.setNotation(musicSheetApplication.getIsConvertibleScore()?YesOrNoEnum.YES:YesOrNoEnum.NO);
+        }
         if (musicSheetApplication.getIsEvaluated() != null){
             sheet.setCanEvaluate(musicSheetApplication.getIsEvaluated()?YesOrNoEnum.YES:YesOrNoEnum.NO);
         }

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

@@ -176,6 +176,9 @@
             or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT'
             )
         </if>
+        <if test="param.subjectIds != null and param.subjectIds != ''">
+            and(find_in_set(#{param.subjectIds},t.music_subject_) or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT')
+        </if>
         <if test="param.musicSheetIdlist != null and param.musicSheetIdlist.size() != 0">
             and t.id_ in
             <foreach collection="param.musicSheetIdlist" separator="," item="item" open="(" close=")">
@@ -830,7 +833,7 @@
             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.state_ = 1,ms.audit_status_ = 'PASS'
+            ms.state_ = 0,ms.audit_status_ = 'PASS'
             <if test="item.musicSheetUpdate != null">
                 ,ms.music_sheet_name_ = #{item.musicSheetUpdate.name},
                 ms.music_subject_ = #{item.musicSheetUpdate.subjectIds},
@@ -844,7 +847,11 @@
                 ms.notation_ = #{item.musicSheetUpdate.notation},
                 ms.music_sheet_type_ = #{item.musicSheetUpdate.musicSheetType},
                 ms.create_by_ = #{item.musicSheetUpdate.userId},
-                ms.source_type_ = CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM' ELSE 'TEACHER' END
+                ms.audio_type_ = #{item.musicSheetUpdate.playMode},
+                ms.notation_ = #{item.musicSheetUpdate.notation},
+                ms.source_type_ = CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
+                WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER'
+                ELSE 'TENANT' END
             </if>
             where ms.cbs_music_sheet_id_ = #{item.musicSheetId}
         </foreach>