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

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

@@ -433,6 +433,31 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     @Transactional(rollbackFor = Exception.class)
     public boolean saveMusicSheet(MusicSheetDto musicSheetDto, Long userId) {
 
+        MusicSheet oldMusicSheet = null;
+        if (musicSheetDto.getId() != null) {
+            oldMusicSheet = getById(musicSheetDto.getId());
+        }
+        // 保存审核拒绝的数据
+        if (musicSheetDto.getId() != null && AuthStatusEnum.DOING.getCode().equals(musicSheetDto.getAuditStatus().getCode())) {
+            // 保存删除的曲目
+            if (oldMusicSheet.getAuditStatus().equals(AuthStatusEnum.UNPASS)) {
+                oldMusicSheet.setId(null);
+                oldMusicSheet.setDelFlag(true);
+                this.save(oldMusicSheet);
+                // 删除的曲目的伴奏
+                musicSheetAccompanimentService.lambdaUpdate()
+                                              .eq(MusicSheetAccompaniment::getMusicSheetId,musicSheetDto.getId())
+                                              .set(MusicSheetAccompaniment::getMusicSheetId,oldMusicSheet.getId())
+                                              .update();
+                // 审核拒绝的原因
+                musicSheetAuthRecordService.lambdaUpdate()
+                                           .eq(MusicSheetAuthRecord::getMusicSheetId,musicSheetDto.getId())
+                                           .set(MusicSheetAuthRecord::getMusicSheetId,oldMusicSheet.getId())
+                                           .update();
+            }
+
+        }
+
         if (musicSheetDto.getId() != null) {
             musicSheetAccompanimentService.delByMusicSheetId(musicSheetDto.getId());
         }
@@ -442,7 +467,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         }
 
         // 删除曲目专辑关联
-        // delAlbumSheetRef(musicSheetDto.getId(), musicSheetDto.getMusicSubject());
+        if (oldMusicSheet != null && !oldMusicSheet.getMusicSubject().equals(musicSheetDto.getMusicSubject())) {
+            delAlbumSheetRef(musicSheetDto.getId(), musicSheetDto.getMusicSubject());
+        }
 
         List<MusicSheetAccompaniment> list;
         if (!AudioTypeEnum.MIDI.getCode().equals(musicSheetDto.getAudioType().getCode())) {

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

@@ -474,17 +474,16 @@
         where find_in_set(mt.id_,ms.music_tag_) and mt.del_flag_ = 0  and mt.state_ = 1) as musicTagNames
         ,ms.play_speed_ as playSpeed
         ,ms.music_price_ as musicPrice
-        ,ms.create_time_ as createTime
+        ,ms.update_time_ as createTime
         ,if(msar.audit_state_ is null,ms.audit_status_,msar.audit_state_) as auditStatus
         ,su2.username_ as auditName
-        from music_sheet ms
+        from music_sheet_auth_record  msar
+        left join  music_sheet ms on ms.id_ = msar.music_sheet_id_
         left join sys_user su on su.id_ = ms.create_by_
-        left join music_sheet_auth_record msar on ms.id_ = msar.music_sheet_id_
         left join sys_user su2 on msar.verify_user_id_ = su2.id_
         <where>
             su.del_flag_ = 0 and
-            ms.source_type_  = 'TEACHER' and
-            msar.id_ is not null
+            ms.source_type_  = 'TEACHER'
             <if test="param.idAndName != null and param.idAndName != ''">
                 and (su.id_ like concat('%',#{param.idAndName} ,'%')
                 or su.username_ like concat('%',#{param.idAndName},'%')
@@ -502,9 +501,6 @@
             <if test="param.endTime != null">
                 and ms.create_time_ &lt; #{param.endTime}
             </if>
-            <if test="param.delFlag != null">
-                and ms.del_flag_ = #{param.delFlag}
-            </if>
             <if test="param.chargeType != null">
                 and ms.charge_type_ = #{param.chargeType}
             </if>