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

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

@@ -58,6 +58,8 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     @Resource
     private SubjectService subjectService;
     @Resource
+    private MusicTagService musicTagService;
+    @Resource
     private SysMessageService sysMessageService;
     @Resource
     private InstrumentService instrumentService;
@@ -282,6 +284,18 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
                     musicSheetService.initMusicSheetDetailVo(addMusicSheet,sheetDetailVo);
                     sheetDetailVo.setMusicSheetJson(null);
                     sheetDetailVo.setSubmitAuditTime(sheetDetailVo.getCreateTime());
+                    //获取声部
+                    String musicSubject = sheetDetailVo.getMusicSubject();
+                    if(StringUtils.isNotEmpty(musicSheetJson)){
+                        List<Subject> list = subjectService.findBySubjectByIdList(musicSubject);
+                        sheetDetailVo.setSubjectNames(list.stream().map(e->e.getName()).collect(Collectors.joining(",")));
+                    }
+                    //获取标签
+                    String musicTagIds = sheetDetailVo.getMusicTag();
+                    if(StringUtils.isNotEmpty(musicTagIds)){
+                        List<MusicTag> list = musicTagService.lambdaQuery().in(MusicTag::getId, musicTagIds.split(",")).list();
+                        sheetDetailVo.setMusicTagNames(list.stream().map(e->e.getName()).collect(Collectors.joining(",")));
+                    }
                 }
             }
         }

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

@@ -771,9 +771,6 @@
         SELECT
         su.username_ as userName
         ,su.avatar_ as userAvatar
-        ,s2.name_ as subjectNames
-        ,s2.code_ as code
-        ,s2.ai_default_frequency_ as aiDefaultFrequency
         ,su.real_name_ as realName
         ,msar.update_time_ as auditTime
         ,msar.create_time_ as submitAuditTime
@@ -787,7 +784,6 @@
         left join music_sheet t on t.id_ = msar.music_sheet_id_
         left join sys_user su on su.id_ = t.create_by_
         left join sys_user su2 on msar.verify_user_id_ = su2.id_
-        left join subject s2 on t.music_subject_ = s2.id_
         <where>
             <if test="musicSheetId != null">
                 and #{musicSheetId} = msar.music_sheet_id_
@@ -796,7 +792,6 @@
                 and #{batchNo} = msar.batch_no_
             </if>
         </where>
-
         order by msar.id_ desc
     </select>