分类排序

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

@@ -49,6 +49,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 		return this.initAccompaniment(sysMusicScoreAccompanimentDao.queryPage(params));
 	}
 
+
 	public List<SysMusicScoreAccompaniment> initAccompaniment(List<SysMusicScoreAccompaniment> accompaniments,List<CbsMusicSheetWrapper.MusicSheetApplication> applications){
 		List<SysMusicScoreAccompaniment> result = new ArrayList<>();
 		if(CollectionUtils.isEmpty(accompaniments)){
@@ -79,52 +80,25 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 			List<SysMusicScoreAccompaniment> childAccompaniments = new ArrayList<>();
 			for (int i = 0; i < musicSheetApplication.getMusicSheetSoundList().size(); i++) {
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
-				record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
-				if(musicSheetApplication.getScoreType() != null){
-					record.setScoreType(musicSheetApplication.getScoreType().getCode());
-				}
 				record.setId(accompaniment.getExamSongId().toString());
-				record.setType(accompaniment.getType());
-				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
-				record.setClientType(accompaniment.getClientType());
-				record.setExamSongId(accompaniment.getExamSongId());
-				record.setCbsMusicSheetId(musicSheetApplication.getId().toString());
-				record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
-				record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
-//				record.setSubjectId(accompaniment.getSubjectId());
-				record.setExtStyleConfigJson(musicSheetApplication.getExtStyleConfigJson());
-				if(musicSheetApplication.getMusicSheetCategoryId() != null){
-					record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
-				}
 				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
-				record.setParentCategoriesId(accompaniment.getParentCategoriesId());
 				record.setExamSongName(musicSheetApplication.getName());
-				record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());
-				record.setSpeed(musicSheetApplication.getPlaySpeed());
 				CbsMusicSheetWrapper.MusicSheetSound sound = musicSheetApplication.getMusicSheetSoundList().get(i);
 				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setTrack(sound.getTrack());
-				record.setSubjectName(sound.getTrack());
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
-				record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
-				record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
-				record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
 					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());
-					record.setUrl(accompanimentList.get(0).getAudioFileUrl());
 				}
-				record.setMetronomeMp3Url(sound.getAudioFileUrl());
 				record.setMp3Url(sound.getAudioFileUrl());
-				record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
-				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
-				record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
 				childAccompaniments.add(record);
 			}
 			result.addAll(childAccompaniments);
 		}
 		return result;
 	}
+
 	public List<SysMusicScoreAccompaniment> initAccompaniment(List<SysMusicScoreAccompaniment> accompaniments){
 		List<SysMusicScoreAccompaniment> result = new ArrayList<>();
 		if(CollectionUtils.isEmpty(accompaniments)){