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

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

@@ -34,6 +34,7 @@ import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 
 @Service
@@ -231,17 +232,28 @@ public class MusicSheetAuthRecordServiceImpl extends ServiceImpl<MusicSheetAuthR
     public MusicSheetDetailVo auditDetail(Long musicSheetAuthRecordId) {
         MusicSheetAuthRecord musicSheetAuthRecord = this.getById(musicSheetAuthRecordId);
         MusicSheetDetailVo detail = musicSheetService.getAuditDetail(musicSheetAuthRecord.getMusicSheetId());
-        List<MusicSheetDetailVo> sheetDetailVos = musicSheetService.getDao().auditDetailList(musicSheetAuthRecord.getMusicSheetId(),null);
-        if (CollectionUtils.isNotEmpty(sheetDetailVos)) {
-            detail.setLastMusicSheet(sheetDetailVos.get(0));
-        }
+//        List<MusicSheetDetailVo> sheetDetailVos = musicSheetService.getDao().auditDetailList(musicSheetAuthRecord.getMusicSheetId(),null);
+//        if (CollectionUtils.isNotEmpty(sheetDetailVos)) {
+//            detail.setLastMusicSheet(sheetDetailVos.get(0));
+//        }
         return detail;
     }
 
     @Override
     public List<MusicSheetDetailVo> auditDetailList(String batchNo) {
         List<MusicSheetDetailVo> sheetDetailVos = musicSheetService.getDao().auditDetailList(null, batchNo);
-        musicSheetService.initMusicSheetDetailVo(sheetDetailVos);
+        if (CollectionUtils.isNotEmpty(sheetDetailVos)) {
+            List<Long> musicSheetIds = sheetDetailVos.stream().map(e -> e.getId()).collect(Collectors.toList());
+            List<MusicSheetAccompaniment> musicSheetAccompaniments = musicSheetAccompanimentService.lambdaQuery()
+                                                                                                    .in(MusicSheetAccompaniment::getMusicSheetId, musicSheetIds)
+                                                                                                    .list();
+            if (CollectionUtils.isNotEmpty(musicSheetAccompaniments)) {
+                Map<Long, List<MusicSheetAccompaniment>> musicSheetAccompanimentMap = musicSheetAccompaniments.stream().collect(Collectors.groupingBy(MusicSheetAccompaniment::getMusicSheetId));
+                for (MusicSheetDetailVo sheetDetailVo : sheetDetailVos) {
+                    sheetDetailVo.setBackground(musicSheetAccompanimentMap.get(sheetDetailVo.getId()));
+                }
+            }
+        }
         return sheetDetailVos;
     }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/vo/MusicSheetDetailVo.java

@@ -56,8 +56,8 @@ public class MusicSheetDetailVo extends MusicSheet {
     @ApiModelProperty("审核理由")
     private String reason;
 
-    @ApiModelProperty("上一次审核的曲目信息")
-    private MusicSheetDetailVo lastMusicSheet;
+//    @ApiModelProperty("上一次审核的曲目信息")
+//    private MusicSheetDetailVo lastMusicSheet;
 
     @ApiModelProperty("真实姓名")
     private String realName;