Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into dev

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

@@ -46,7 +46,28 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 	public List<SysMusicScoreAccompaniment> queryAll(SysExamSongQueryInfo queryInfo) {
 		Map<String, Object> params = new HashMap<>();
 		MapUtil.populateMap(params, queryInfo);
-		return this.initAccompaniment(sysMusicScoreAccompanimentDao.queryPage(params));
+		List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments = sysMusicScoreAccompanimentDao.queryPage(params);
+		Map<Integer, SysMusicScoreCategories> categoriesMap = new HashMap<>();
+		if(CollectionUtils.isNotEmpty(sysMusicScoreAccompaniments)){
+			List<Integer> categoryIds = sysMusicScoreAccompaniments.stream()
+					.map(SysMusicScoreAccompaniment::getCategoriesId).distinct().collect(Collectors.toList());
+			List<SysMusicScoreCategories> categories = cbsMusicScoreCategoriesService.queryByIds(categoryIds.stream()
+					.map(String::valueOf).collect(Collectors.joining(",")));
+			categoriesMap = categories.stream().collect(Collectors.toMap(SysMusicScoreCategories::getId, Function.identity()));
+		}
+		for (SysMusicScoreAccompaniment sysMusicScoreAccompaniment : sysMusicScoreAccompaniments) {
+			SysMusicScoreCategories categories = categoriesMap.get(sysMusicScoreAccompaniment.getCategoriesId());
+			if(categories != null){
+				sysMusicScoreAccompaniment.setCategoriesName(categories.getName());
+				sysMusicScoreAccompaniment.setParentCategoriesId(categories.getParentId());
+			}
+			if (sysMusicScoreAccompaniment.getIsOpenMetronome() ==null || sysMusicScoreAccompaniment.getIsOpenMetronome()) {
+				if (StringUtils.isNotBlank(sysMusicScoreAccompaniment.getUrl())) {
+					sysMusicScoreAccompaniment.setMetronomeUrl(sysMusicScoreAccompaniment.getUrl());
+				}
+			}
+		}
+		return this.initAccompaniment(sysMusicScoreAccompaniments);
 	}