Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into develop-new

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

@@ -551,7 +551,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             sheet.setAccompanimentType(AccompanimentTypeEnum.valueOf(musicSheetApplication.getAudioType().getCode()));
         }
         sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
-        sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
+        if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
+            sheet.setSubjectNames(null);
+        }else {
+            sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
+        }
         sheet.setPaymentType(musicSheetApplication.getPaymentType());
         sheet.setSortNumber(musicSheetApplication.getSortNo());
         if (musicSheetApplication.getTopFlag() != null){
@@ -830,7 +834,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     }
 
     public void initMusicSheetVo(MusicSheetVo record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication){
-        record.setSubjectNames(musicSheetApplication.getSubjectNames());
+        if (musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT) {
+            record.setSubjectNames(null);
+        } else {
+            record.setSubjectNames(musicSheetApplication.getSubjectNames());
+        }
         record.setCbsMusicSheetId(musicSheetApplication.getId());
         record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
         record.setCanEvaluate(musicSheetApplication.getIsEvaluated() ? YesOrNoEnum.YES : YesOrNoEnum.NO);
@@ -1577,9 +1585,9 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
         if (CollectionUtils.isEmpty(rows)){
             throw new BizException("查询曲谱信息失败");
         }
-        List<Subject> subjects = subjectService.getDao().getByCbsSubjectIds(rows.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getSubjectIds).
-                filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
-        Map<Long, String> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getCbsSubjectId, Subject::getName));
+//        List<Subject> subjects = subjectService.getDao().getByCbsSubjectIds(rows.stream().map(CbsMusicSheetWrapper.MusicSheetApplication::getSubjectIds).
+//                filter(StringUtils::isNotEmpty).collect(Collectors.joining(",")));
+//        Map<Long, String> subjectMap = subjects.stream().collect(Collectors.toMap(Subject::getCbsSubjectId, Subject::getName));
 
         Map<Long,CbsMusicSheetWrapper.MusicSheetApplication> musicSheetMap =
                 rows.stream().collect(Collectors.toMap(CbsMusicSheetWrapper.MusicSheetApplication::getId, Function.identity()));
@@ -1588,7 +1596,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             if(musicSheetApplication == null){
                 continue;
             }
-            if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
+            /*if(StringUtils.isNotEmpty(musicSheetApplication.getSubjectIds())){
                 StringBuffer sb = new StringBuffer();
                 for (String s : musicSheetApplication.getSubjectIds().split(",")) {
                     String subjectName = subjectMap.get(Long.parseLong(s));
@@ -1599,7 +1607,11 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
                         sb.append(subjectName);
                     }
                 }
-                record.setSubjectNames(sb.toString());
+            }*/
+            if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
+                record.setSubjectNames(null);
+            }else {
+                record.setSubjectNames(musicSheetApplication.getSubjectNames());
             }
             record.setCbsMusicSheetId(musicSheetApplication.getId());
             record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));

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

@@ -321,7 +321,6 @@ public class SubjectServiceImpl extends BaseServiceImpl<Long, Subject> implement
                 dataList = new ArrayList<>();
                 CbsSubjectWrapper.SubjectQuery subjectQuery = new CbsSubjectWrapper.SubjectQuery();
                 subjectQuery.setIds(cbsSubjectIds);
-                subjectQuery.setName(query.getKeyword());
                 subjectQuery.setPage(1);
                 subjectQuery.setRows(query.getRows());
                 try {

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

@@ -150,7 +150,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
                 CbsMusicSheetWrapper.MusicSheetApplication sheetApplication = recordMap.get(m.getCbsMusicSheetId());
                 if (sheetApplication != null) {
                     if(StringUtils.equals(m.getMusicSheetType(),"CONCERT")){
-                        m.setMusicSubjectName("合奏");
+                        m.setMusicSubjectName(null);
                     }else{
                         m.setMusicSubjectName(sheetApplication.getSubjectNames());
                     }