分类查询

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/TenantMusicSheetApplicationExtendController.java

@@ -49,7 +49,18 @@ public class TenantMusicSheetApplicationExtendController {
 
     @PreAuthorize("@pcs.hasPermissions('tenantMusicSheetApplicationExtend/pageByApplication')")
     @PostMapping({"/pageByApplication"})
-    public R<PageInfo<MusicSheetWrapper.MusicSheetApplication>> musicSheetPageByApplication(@RequestBody CbsMusicSheetWrapper.MusicSheetApplicationQuery var1){
+    public R<PageInfo<MusicSheetWrapper.MusicSheetApplication>> musicSheetPageByApplication(@RequestBody MusicSheetWrapper.MusicSheetApplicationQuery var1){
+        if (StringUtils.isNotBlank(var1.getSubjectType())) {
+            Long categoryId = null;
+            if (SubjectTypeEnum.SUBJECT.name().equals(var1.getSubjectType())) {
+                categoryId= Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_SUBJECT_TYPE_CATEGORY));
+            } else if (SubjectTypeEnum.ENSEMBLE.name().equals(var1.getSubjectType())) {
+                categoryId= Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_ENSEMBLE_TYPE_CATEGORY));
+            } if (SubjectTypeEnum.MUSIC.name().equals(var1.getSubjectType())) {
+                categoryId = Long.parseLong(sysConfigService.findConfigValue(SysConfigConstant.TENANT_ALBUM_MUSIC_TYPE_CATEGORY));
+            }
+            var1.setMusicCategoryId(categoryId);
+        }
 
         return R.from(musicSheetService.tenantPage(var1));
     }

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

@@ -920,4 +920,10 @@ public class MusicSheetWrapper {
         private Long musicSheetCategoryId;
 
     }
+
+    @Data
+    public static class MusicSheetApplicationQuery extends CbsMusicSheetWrapper.MusicSheetApplicationQuery {
+        @ApiModelProperty("类型")
+        private String subjectType;
+    }
 }

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

@@ -53,7 +53,7 @@
         ,(select count(1) as num
             from album_music_relate amr
             join music_sheet ms on amr.music_sheet_id_ = ms.id_
-            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS'
+            where ms.del_flag_ = 0 and ms.state_ = 1 and ms.audit_status_ = 'PASS' and find_in_set('PLATFORM',ms.provider_type_)
             and amr.album_id_ = t.id_) as musicSheetCount
         ,t2.num as albumFavoriteCount
         <if test="query.userId != null">