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

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

@@ -89,6 +89,9 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
         musicSheet.setAuditStatus(param.getAuthStatus());
         musicSheet.setUpdateBy(userId);
         if (param.getAuthStatus().equals(AuthStatusEnum.PASS)) {
+            if(musicSheet.getCbsMusicSheetId() == null){
+                musicSheet.setCbsMusicSheetId(IdWorker.getId());
+            }
             musicSheetService.updateById(musicSheet);
             // 修改老师标签
             teacherService.setTeacherTag(musicSheet.getUserId(), TeacherTagEnum.MUSIC);
@@ -107,9 +110,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
             addMusicSheet.setIsEvaluated(param.getCanEvaluate()==YesOrNoEnum.YES);
             addMusicSheet.setIsPlayBeat(true);
             addMusicSheet.setIsUseSystemBeat(param.getHasBeat()!=YesOrNoEnum.YES);
-            if(musicSheet.getCbsMusicSheetId() == null){
-                musicSheet.setCbsMusicSheetId(IdWorker.getId());
-            }
             addMusicSheet.setId(musicSheet.getCbsMusicSheetId());
             //修改声部和乐器为内容平台id
             String musicalInstrumentIds = addMusicSheet.getMusicalInstrumentIds();
@@ -145,29 +145,6 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     }
 
 
-    /*@Override
-    public void setAuditDoing(Long musicSheetId, Long originalMusicSheetId, Long lastMusicSheetId) {
-        List<MusicSheetAuthRecord> list = this.lambdaQuery()
-                                              .eq(MusicSheetAuthRecord::getMusicSheetId, musicSheetId)
-                                              .eq(MusicSheetAuthRecord::getAuditState, AuthStatusEnum.DOING.getCode())
-                                              .list();
-        if (!CollectionUtils.isEmpty(list)) {
-            return;
-        }
-        MusicSheetAuthRecord musicSheetAuthRecord = new MusicSheetAuthRecord();
-        musicSheetAuthRecord.setMusicSheetId(musicSheetId);
-        musicSheetAuthRecord.setAuditState(AuthStatusEnum.DOING);
-        if (originalMusicSheetId == null) {
-            originalMusicSheetId = musicSheetId;
-            musicSheetAuthRecord.setFirstAuth(0);
-        } else {
-            musicSheetAuthRecord.setFirstAuth(1);
-        }
-        musicSheetAuthRecord.setCreateTime(new Date());
-        musicSheetAuthRecord.setOriginalMusicSheetId(originalMusicSheetId);
-        this.saveOrUpdate(musicSheetAuthRecord);
-    }*/
-
     @Override
     public String selectAuditReason(Long musicSheetId) {
         MusicSheetAuthRecord one = this.lambdaQuery()

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

@@ -96,14 +96,13 @@
     </sql>
     <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_
+        (cbs_music_sheet_id_,music_tag_,payment_type_,charge_type_,top_flag_,exquisite_flag_,sort_number_,state_,audit_status_
             ,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_
+         music_price_,notation_,music_sheet_type_,source_type_,provider_type_,audio_type_,show_fingering_,can_evaluate_,create_by_,user_id_
         )
         values
         <foreach collection="vos" item="item" separator=",">
-            (#{item.musicSheetId},CASE WHEN #{item.availableType} = 'PLATFORM' THEN 'PLATFORM'
-            WHEN #{item.availableType} = 'PERSON' THEN 'TEACHER' ELSE 'TENANT' END,
+            (#{item.musicSheetId},
              #{item.musicTagIds},#{item.paymentType},#{item.paymentType},
              #{item.topFlag},#{item.exquisiteFlag},#{item.sortNo},0
              ,CASE WHEN #{item.delFlag} THEN 'DOING' ELSE 'PASS' END
@@ -119,6 +118,9 @@
             CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
                 WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER'
                 ELSE 'TENANT' END,
+            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},
@@ -827,8 +829,7 @@
     </update>
     <update id="updateBatchByCbsId">
         <foreach collection="vos" item="item" index="index" separator=";">
-            update music_sheet ms set ms.provider_type_ = CASE WHEN #{item.availableType} = 'PLATFORM' THEN 'PLATFORM'
-            WHEN #{item.availableType} = 'PERSON' THEN 'TEACHER' ELSE 'TENANT' END,
+            update music_sheet ms set
             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},
@@ -852,6 +853,8 @@
                 ms.can_evaluate_ = #{item.musicSheetUpdate.canEvaluate},
                 ms.source_type_ = CASE WHEN #{item.musicSheetUpdate.sourceType} = 'PLATFORM' THEN 'PLATFORM'
                 WHEN #{item.musicSheetUpdate.sourceType} = 'PERSON' THEN 'TEACHER'
+                ms.provider_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}