Merge branch 'feature/0721-tenant'

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -28,9 +28,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
@@ -59,6 +57,12 @@ public class TenantAlbumController {
     @Autowired
     private MusicSheetService musicSheetService;
 
+    @Autowired
+    private SubjectService subjectService;
+
+    @Autowired
+    private MusicTagService musicTagService;
+
     /**
      * 查询分页
      *
@@ -132,8 +136,32 @@ public class TenantAlbumController {
                 tenantAlbumSheet.setMusicSheetName(musicSheet.getMusicSheetName());
                 tenantAlbumSheet.setMusicTag(musicSheet.getMusicTag());
                 tenantAlbumSheet.setComposer(musicSheet.getComposer());
+                tenantAlbumSheet.setMusicSubject(musicSheet.getMusicSubject());
                 return tenantAlbumSheet;
             }).collect(Collectors.toList());
+            tenantAlbumSheets.stream().forEach(t->{
+                String musicSubject = t.getMusicSubject();
+
+                if (!musicSubject.isEmpty()){
+                    //设置对应声部名称
+                    List<Subject> subject = subjectService.findBySubjectByIdList(musicSubject);
+                    t.setMusicSubjectName(subject.get(0).getName());
+                }
+
+
+                //设置对应标签名称
+                String musicTag = t.getMusicTag();
+                if (!musicTag.isEmpty()){
+                    String[] split = musicTag.split(",");
+                    for (String s : split) {
+                        List<Long> list = new ArrayList<>();
+                        list.add(Long.parseLong(s));
+                        String tagName = musicTagService.getMusicTagNames(list);
+                        t.setMusicTagName(tagName);
+                    }
+                }
+
+            });
 
 
             sheetData.setTenantAlbumSheetList(tenantAlbumSheets);

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

@@ -74,8 +74,10 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
         List<TenantAlbumWrapper.TenantAlbum> list = new ArrayList<>();
 
             //查询生效的机构专辑id
+        if (id != null){
             List<Long> tenantIds = baseMapper.selectTenantIds(id);
             List<TenantAlbum> tenantAlbums = baseMapper.selectTenantAlbumInfo(tenantIds);
+
             tenantAlbums.stream().forEach(i->{
                 TenantAlbumWrapper.TenantAlbum vo = JSON.parseObject(JSON.toJSONString(i),
                         TenantAlbumWrapper.TenantAlbum.class);
@@ -134,7 +136,7 @@ public class UserTenantAlbumRecordServiceImpl extends ServiceImpl<UserTenantAlbu
                 });
                 list.add(vo);
             });
-
+        }
         return page.setRecords(list);
     }
 	

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/TenantAlbumWrapper.java

@@ -310,10 +310,15 @@ public class TenantAlbumWrapper {
         @ApiModelProperty(value = "曲谱声部(适用的乐器,可能是多个,用逗号分隔)")
         private String musicSubject;
 
+        @ApiModelProperty(value = "曲谱声部名称")
+        private String musicSubjectName;
 
         @ApiModelProperty(value = "曲谱标签(多个标签用逗号分隔)")
         private String musicTag;
 
+        @ApiModelProperty(value = "曲谱标签名称")
+        private String musicTagName;
+
         @ApiModelProperty(value = "曲谱来源(平台用户ID或者是老师ID)")
         private Long userId;