Merge branch 'zx_online_cbs' of http://git.dayaedu.com/yonge/cooleshow into test

# Conflicts:
#	cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CbsMusicSheetServiceImpl.java

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

@@ -59,12 +59,7 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
 
         List<Long> cbsMusicSheetIds = addMusicSheet.stream().map(e -> e.getMusicSheetId()).collect(Collectors.toList());
         for (CbsMusicSheetApplicationExtendWrapper.MusicSheetApplicationExtend extend : addMusicSheet) {
-            //是否合奏曲目
-            EMusicSheetType musicSheetType = extend.getMusicSheetUpdate().getMusicSheetType();
             CbsMusicSheetApiWrapper.MusicSheetUpdate musicSheetUpdate = extend.getMusicSheetUpdate();
-            if(musicSheetType == EMusicSheetType.CONCERT){
-                musicSheetUpdate.setSubjectIds(null);
-            }
             if(StringUtils.isNotBlank(musicSheetUpdate.getSubjectIds())) {
                 List<Subject> subjectIds = subjectService.getDao().getByCbsSubjectIds(musicSheetUpdate.getSubjectIds());
                 if (CollectionUtils.isNotEmpty(subjectIds)) {
@@ -138,9 +133,6 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
     }
 
     public boolean updateMusicSheet(CbsMusicSheetApiWrapper.MusicSheetUpdate musicSheetUpdate) {
-        if(musicSheetUpdate.getMusicSheetType() == EMusicSheetType.CONCERT){
-            musicSheetUpdate.setSubjectIds(null);
-        }
         if(StringUtils.isNotBlank(musicSheetUpdate.getSubjectIds())) {
             List<Subject> subjectIds = subjectService.getDao().getByCbsSubjectIds(musicSheetUpdate.getSubjectIds());
             if (CollectionUtils.isNotEmpty(subjectIds)) {

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

@@ -550,11 +550,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             sheet.setAccompanimentType(AccompanimentTypeEnum.valueOf(musicSheetApplication.getAudioType().getCode()));
         }
         sheet.setMusicTagNames(musicSheetApplication.getMusicTagNames());
-        if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
-            sheet.setSubjectNames(null);
-        }else {
-            sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
-        }
+        sheet.setSubjectNames(musicSheetApplication.getSubjectNames());
         sheet.setPaymentType(musicSheetApplication.getPaymentType());
         sheet.setSortNumber(musicSheetApplication.getSortNo());
         if (musicSheetApplication.getTopFlag() != null){
@@ -801,11 +797,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
     }
 
     public void initMusicSheetVo(MusicSheetVo record,CbsMusicSheetWrapper.MusicSheetApplication musicSheetApplication){
-        if (musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT) {
-            record.setSubjectNames(null);
-        } else {
-            record.setSubjectNames(musicSheetApplication.getSubjectNames());
-        }
+        record.setSubjectNames(musicSheetApplication.getSubjectNames());
         record.setMusicPrice(musicSheetApplication.getMusicPrice());
         record.setCbsMusicSheetId(musicSheetApplication.getId());
         record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
@@ -1556,11 +1548,7 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             if(musicSheetApplication == null){
                 continue;
             }
-            if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
-                record.setSubjectNames(null);
-            }else {
-                record.setSubjectNames(musicSheetApplication.getSubjectNames());
-            }
+            record.setSubjectNames(musicSheetApplication.getSubjectNames());
             record.setMusicPrice(musicSheetApplication.getMusicPrice());
             record.setCbsMusicSheetId(musicSheetApplication.getId());
             record.setAudioType(AudioTypeEnum.valueOf(musicSheetApplication.getPlayMode().getCode()));
@@ -2382,9 +2370,6 @@ public class MusicSheetServiceImpl extends ServiceImpl<MusicSheetDao, MusicSheet
             throw new BizException("曲目不存在");
         }
         queryInfo.setMusicSheetType(musicSheet.getMusicSheetType());
-        if (musicSheet.getMusicSheetType() == MusicSheetTypeEnum.CONCERT) {
-            queryInfo.setSubjectId(null);
-        }
         return musicSheetDao.queryTenantRelatedList(page,queryInfo);
     }
 

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

@@ -135,11 +135,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             for (TenantAlbumMusicWrapper.StudentTenantAlbumMusic m : musicSheets) {
                 CbsMusicSheetWrapper.MusicSheetApplication sheetApplication = recordMap.get(m.getCbsMusicSheetId());
                 if (sheetApplication != null) {
-                    if(StringUtils.equals(m.getMusicSheetType(),"CONCERT")){
-                        m.setMusicSubjectName(null);
-                    }else{
-                        m.setMusicSubjectName(sheetApplication.getSubjectNames());
-                    }
+                    m.setMusicSubjectName(sheetApplication.getSubjectNames());
                     m.setTitleImg(sheetApplication.getMusicCover());
                 }
                 SysUser sysUser = userMap.get(m.getUserId());

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

@@ -51,7 +51,7 @@
                 </foreach>
             </if>
             <if test="param.subjectIdList != null and param.subjectIdList.size() != 0">
-                and (ms.music_subject_ is null or ms.music_subject_ = '' OR ms.music_sheet_type_ = 'CONCERT' OR ms.is_all_subject_ OR
+                and (ms.music_subject_ is null or ms.music_subject_ = '' OR ms.is_all_subject_ OR
                 <foreach collection="param.subjectIdList" separator="or" item="item" open="(" close=")">
                     find_in_set(#{item},ms.music_subject_)
                 </foreach>)

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

@@ -218,11 +218,11 @@
             <foreach collection="param.subjectIdList" separator="or" item="item" open="(" close=")">
                 find_in_set(#{item},t.music_subject_)
             </foreach>
-            or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT' OR t.is_all_subject_
+            or t.music_subject_ is null or t.music_subject_ = '' OR t.is_all_subject_
             )
         </if>
         <if test="param.subjectIds != null and param.subjectIds != ''">
-            and(find_in_set(#{param.subjectIds},t.music_subject_) or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT' OR t.is_all_subject_)
+            and(find_in_set(#{param.subjectIds},t.music_subject_) or t.music_subject_ is null or t.music_subject_ = '' OR t.is_all_subject_)
         </if>
         <if test="param.musicSheetIdlist != null and param.musicSheetIdlist.size() != 0">
             and t.id_ in
@@ -973,7 +973,7 @@
             <where>
                 t.state_=1 and t.audit_version_ = 0 and t.del_flag_ = 0 and t.audit_status_ = 'PASS'
                 <if test="param.subjectId != null">
-                    and ( t.music_subject_ = #{param.subjectId} or t.music_subject_ is null or t.music_subject_ = ''  or t.music_sheet_type_ = 'CONCERT' OR t.is_all_subject_)
+                    and ( t.music_subject_ = #{param.subjectId} or t.music_subject_ is null or t.music_subject_ = '' OR t.is_all_subject_)
                 </if>
                 <if test="param.name != null and param.name != ''">
                     and t.music_sheet_name_ like concat('%',#{param.name},'%')

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

@@ -37,7 +37,7 @@
                 and (find_in_set(#{param.musicTagId},m.music_tag_))
             </if>
             <if test="param.subjectId != null" >
-                and (find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '' or m.music_sheet_type_ = 'CONCERT' OR m.is_all_subject_)
+                and (find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '' OR m.is_all_subject_)
             </if>
             <if test="param.subjectType != null">
                 and t.subject_type_ = #{param.subjectType}
@@ -124,7 +124,7 @@
         </if>
         <if test="param.subjectId != null">
             and ( find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = ''
-            or m.music_sheet_type_ = 'CONCERT'  or t.subject_type_ not in  ('ENSEMBLE', 'MUSIC', 'SUBJECT') OR m.is_all_subject_)
+            or t.subject_type_ not in  ('ENSEMBLE', 'MUSIC', 'SUBJECT') OR m.is_all_subject_)
         </if>
     </select>
 </mapper>