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

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

@@ -6,10 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.extension.service.additional.update.impl.LambdaUpdateChainWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.beust.jcommander.internal.Lists;
-import com.dayaedu.cbs.common.enums.music.EAudioType;
-import com.dayaedu.cbs.common.enums.music.EEvaluationStandard;
-import com.dayaedu.cbs.common.enums.music.EMusicPlayMode;
-import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
+import com.dayaedu.cbs.common.enums.music.*;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.client.MusicFeignClientService;
 import com.dayaedu.cbs.openfeign.properties.OpenFeignClientConfigProperties;
@@ -315,6 +312,10 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (musicSheetApplication.getAppAuditFlag() != null){
             sheet.setAuditVersion(musicSheetApplication.getAppAuditFlag()?YesOrNoEnum.YES:YesOrNoEnum.NO);
         }
+        if(musicSheetApplication.getAvailableType() != null){
+            sheet.setProviderType(musicSheetApplication.getAvailableType() == EMusicAvailableType.PERSON ? SourceTypeEnum.TEACHER :
+                    musicSheetApplication.getAvailableType() == EMusicAvailableType.ORG ? SourceTypeEnum.TENANT :SourceTypeEnum.PLATFORM);
+        }
         sheet.setUpdateBy(musicSheetApplication.getUpdateBy());
         sheet.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         sheet.setMusicJSON(musicSheetApplication.getMusicJson());

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

@@ -98,13 +98,15 @@
         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_price_,notation_,music_sheet_type_,source_type_,audio_type_
-         ,create_by_
+         music_price_,notation_,music_sheet_type_,source_type_,audio_type_,show_fingering_,can_evaluate_,create_by_
         )
         values
         <foreach collection="vos" item="item" separator=",">
-            (#{item.musicSheetId},#{item.availableType},#{item.musicTagIds},#{item.paymentType},#{item.paymentType},
-             #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},1,'PASS'
+            (#{item.musicSheetId},CASE WHEN #{item.availableType} = 'PLATFORM' THEN 'PLATFORM'
+            WHEN #{item.availableType} = 'PERSON' THEN 'TEACHER'
+            ELSE 'TENANT' END,
+             #{item.musicTagIds},#{item.paymentType},#{item.paymentType},
+             #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},0,'PASS'
             ,#{item.musicSheetUpdate.name},
             #{item.musicSheetUpdate.subjectIds},
             #{item.musicSheetUpdate.musicSvg},
@@ -116,10 +118,12 @@
             #{item.musicSheetUpdate.musicPrice},
             #{item.musicSheetUpdate.notation},
             #{item.musicSheetUpdate.musicSheetType},
-            #{item.musicSheetUpdate.playMode},
             CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
                 WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER'
                 ELSE 'TENANT' END,
+            #{item.musicSheetUpdate.playMode},
+            #{item.musicSheetUpdate.showFingering},
+            #{item.musicSheetUpdate.canEvaluate},
             #{item.musicSheetUpdate.userId}
              )
         </foreach>
@@ -828,7 +832,8 @@
     </update>
     <update id="updateBatchByCbsId">
         <foreach collection="vos" item="item" index="index" separator=";">
-            update music_sheet ms set ms.provider_type_ = #{item.availableType},
+            update music_sheet ms set ms.provider_type_ = CASE WHEN #{item.availableType} = 'PLATFORM' THEN 'PLATFORM'
+            WHEN #{item.availableType} = 'PERSON' THEN 'TEACHER' ELSE 'TENANT' END,
             ms.music_tag_ = #{item.musicTagIds},ms.payment_type_ = #{item.paymentType},
             ms.charge_type_ = #{item.paymentType},
             ms.music_price_ = #{item.musicPrice},ms.top_flag_ = #{item.topFlag},
@@ -849,6 +854,8 @@
                 ms.create_by_ = #{item.musicSheetUpdate.userId},
                 ms.audio_type_ = #{item.musicSheetUpdate.playMode},
                 ms.notation_ = #{item.musicSheetUpdate.notation},
+                ms.show_fingering_ = #{item.musicSheetUpdate.showFingering},
+                ms.can_evaluate_ = #{item.musicSheetUpdate.canEvaluate},
                 ms.source_type_ = CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
                 WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER'
                 ELSE 'TENANT' END

pom.xml

@@ -23,7 +23,7 @@
 		<google.zxing.version>3.4.0</google.zxing.version>
 		<redisson.version>3.11.5</redisson.version>
 		<maven.test.skip>true</maven.test.skip>
-		<cbs.version>1.0.5</cbs.version>
+		<cbs.version>1.0.7</cbs.version>
 	</properties>