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

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

@@ -402,6 +402,16 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         MusicSheetDetailVo detailVo = JSON.parseObject(JSON.toJSONString(musicSheet), MusicSheetDetailVo.class);
         List<MusicSheetAccompaniment> list = musicSheetAccompanimentService.lambdaQuery().eq(MusicSheetAccompaniment::getMusicSheetId, id).list();
         detailVo.setBackground(list);
+        //声部名称
+        List<Subject> subjectList = subjectService.findBySubjectByIdList(musicSheet.getMusicSubject());
+        detailVo.setSubjectNames(subjectList.stream().map(e->e.getName()).collect(Collectors.joining(",")));
+        //曲目标签
+        if(StringUtils.isNotEmpty(musicSheet.getMusicTag())){
+            List<MusicTag> musicTagList = musicTagService.lambdaQuery()
+                    .in(MusicTag::getId, Arrays.stream(musicSheet.getMusicTag().split(","))
+                            .map(Long::parseLong).collect(Collectors.toList())).list();
+            detailVo.setMusicTagNames(musicTagList.stream().map(MusicTag::getName).collect(Collectors.joining(",")));
+        }
         return detailVo;
     }
 
@@ -2051,9 +2061,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             if(applicationExtend.getExquisiteFlag() != null){
                 musicSheetAudit.setExquisiteFlag(applicationExtend.getExquisiteFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
             }
-            if(applicationExtend.getExquisiteFlag() != null){
-                musicSheetAudit.setExquisiteFlag(applicationExtend.getExquisiteFlag()? YesOrNoEnum.YES: YesOrNoEnum.NO);
-            }
             musicSheetAudit.setSortNumber(applicationExtend.getSortNo());
             musicSheetAudit.setMusicPrice(applicationExtend.getMusicPrice());
         }