Merge branch 'feature/1022_vip' into dev

mec-application/src/main/java/com/ym/mec/student/controller/MusicSheetController.java

@@ -147,6 +147,7 @@ public class MusicSheetController {
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setUserId(userId);
+        queryInfo.setUserType(ClientEnum.STUDENT);
         queryInfo.setClientId(ClientEnum.STUDENT.getCode().toLowerCase());
         PageInfo<SysMusicScore> sysMusicScorePageInfo1 = musicSheetService.queryMusicScorePageInfo(queryInfo);
         PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo1.convert(o -> {

mec-application/src/main/java/com/ym/mec/teacher/controller/MusicSheetController.java

@@ -152,6 +152,7 @@ public class MusicSheetController {
         queryInfo.setClientFlag(true);
         queryInfo.setClientType(ClientTypeEnum.SMART_PRACTICE);
         queryInfo.setUserId(userId);
+        queryInfo.setUserType(ClientEnum.TEACHER);
         queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setClientId(ClientEnum.TEACHER.getCode().toLowerCase());
         PageInfo<SysMusicScore> sysMusicScorePageInfo1 = musicSheetService.queryMusicScorePageInfo(queryInfo);

mec-application/src/main/java/com/ym/mec/web/controller/MusicSheetController.java

@@ -142,6 +142,7 @@ public class MusicSheetController {
         queryInfo.setUserId(userId);
         queryInfo.setRecentFlag(query.getRecentFlag());
         queryInfo.setClientId("education");
+        queryInfo.setUserType(ClientEnum.SCHOOL);
         PageInfo<SysMusicScore> sysMusicScorePageInfo = musicSheetService.queryMusicScorePage(queryInfo);
         PageInfo<MusicSheetWrapper.MusicSheet> convert = sysMusicScorePageInfo.convert(o -> {
             MusicSheetWrapper.MusicSheet musicSheet = new MusicSheetWrapper.MusicSheet();

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScoreAccompaniment.java

@@ -51,7 +51,8 @@ public class SysMusicScoreAccompaniment {
 
 	/**  */
 	private Integer categoriesId;
-	
+	private Integer cbsCategoriesId;
+
 	private Integer parentCategoriesId;
 
 	/**  */

mec-biz/src/main/java/com/ym/mec/biz/service/impl/SysMusicScoreAccompanimentServiceImpl.java

@@ -203,6 +203,9 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				if(musicSheetApplication.getMusicSheetCategoryId() != null){
 					record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 				}
+                if (musicSheetApplication.getMusicCategoryId() != null) {
+                    record.setCbsCategoriesId(musicSheetApplication.getMusicCategoryId().intValue());
+                }
 				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
 				record.setParentCategoriesId(accompaniment.getParentCategoriesId());
 				record.setExamSongName(musicSheetApplication.getName());
@@ -378,11 +381,11 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 
 			// 判断曲目是否在分类中
 			for (SysMusicScoreAccompaniment row : accompaniments) {
-				if (categoryIds.contains(row.getCategoriesId())) {
+                if (StringUtils.isBlank(row.getRankIds())) {
+                    row.setUseStatus("FREE");
+                } else if (categoryIds.contains(row.getCbsCategoriesId())) {
 					row.setUseStatus("UNLOCK");
-				} else if (StringUtils.isBlank(row.getRankIds())) {
-					row.setUseStatus("FREE");
-				} else {
+				} else  {
 					row.setUseStatus("LOCK");
 				}
 			}