|
|
@@ -19,16 +19,10 @@ import com.ym.mec.biz.dal.dao.SysMusicScoreAccompanimentDao;
|
|
|
import com.ym.mec.biz.dal.dao.SysMusicScoreCategoriesDao;
|
|
|
import com.ym.mec.biz.dal.dao.SysMusicScoreDao;
|
|
|
import com.ym.mec.biz.dal.dto.ReasonDto;
|
|
|
-import com.ym.mec.biz.dal.entity.Subject;
|
|
|
-import com.ym.mec.biz.dal.entity.SysMusicScore;
|
|
|
-import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
|
|
|
-import com.ym.mec.biz.dal.entity.SysMusicScoreCategories;
|
|
|
+import com.ym.mec.biz.dal.entity.*;
|
|
|
import com.ym.mec.biz.dal.enums.YesOrNoEnum;
|
|
|
import com.ym.mec.biz.dal.page.SysExamSongQueryInfo;
|
|
|
-import com.ym.mec.biz.service.OrganizationService;
|
|
|
-import com.ym.mec.biz.service.SubjectService;
|
|
|
-import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
|
|
|
-import com.ym.mec.biz.service.SysMusicScoreService;
|
|
|
+import com.ym.mec.biz.service.*;
|
|
|
import com.ym.mec.common.dal.BaseDAO;
|
|
|
import com.ym.mec.common.exception.BizException;
|
|
|
import com.ym.mec.common.page.PageInfo;
|
|
|
@@ -66,6 +60,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
|
private SysMusicScoreAccompanimentDao sysMusicScoreAccompanimentDao;
|
|
|
@Resource
|
|
|
private MusicFeignClientService musicFeignClientService;
|
|
|
+ @Resource
|
|
|
+ private InstrumentService instrumentService;
|
|
|
|
|
|
@Value("${openfeign-client.app-id:1745637981387108354}")
|
|
|
public Long applicationId;
|
|
|
@@ -413,14 +409,20 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
|
.map(Integer::parseInt).distinct().collect(Collectors.toList());
|
|
|
List<Subject> list = subjectService.findBySubjectByIdList(subjectIds);
|
|
|
if (CollectionUtils.isNotEmpty(list)) {
|
|
|
- addMusicSheet.setSubjectIds(list.stream().map(o->o.getCbsSubjectId().toString()).collect(Collectors.joining(",")));
|
|
|
+ addMusicSheet.setSubjectIds(list.stream().filter(e->e.getCbsSubjectId() != null).map(o->o.getCbsSubjectId().toString()).collect(Collectors.joining(",")));
|
|
|
+ //获取关联的乐器
|
|
|
+ List<Instrument> list1 = instrumentService.lambdaQuery().in(Instrument::getSubjectId, subjectIds).list();
|
|
|
+ if (CollectionUtils.isNotEmpty(list1)) {
|
|
|
+ addMusicSheet.setMusicalInstrumentIds(list1.stream().map(o -> o.getId().toString()).collect(Collectors.joining(",")));
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
addMusicSheet.setSendAppFlag(false);
|
|
|
+ addMusicSheet.setMusicCover("https://oss.dayaedu.com/gyt/07/1690789356356.png");
|
|
|
addMusicSheet.setAppAuditFlag(false);
|
|
|
addMusicSheet.setRemark(from.getMuseScoreMemo());
|
|
|
addMusicSheet.setIsUseSystemBeat(true);
|
|
|
- if(categoryIds.contains(from.getCategoriesId().toString())){
|
|
|
+ if(categoryIds.contains(from.getMusicScoreCategoriesId().toString())){
|
|
|
addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
|
|
|
}else {
|
|
|
addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);
|
|
|
@@ -484,7 +486,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
|
|
|
addMusicSheetApplicationExtend.setSortNo(from.getOrder());
|
|
|
addMusicSheetApplicationExtend.setPaymentType(StringUtils.isNotEmpty(from.getRankIds()) ? "PAY" : "FREE");
|
|
|
addMusicSheetApplicationExtend.setAvailableType(EMusicAvailableType.ORG);
|
|
|
- addMusicSheetApplicationExtend.setMusicSheetCategoryId(from.getCategoriesId().longValue());
|
|
|
+ addMusicSheetApplicationExtend.setMusicSheetCategoryId(from.getMusicScoreCategoriesId().longValue());
|
|
|
addMusicSheet.setAddMusicSheetApplicationExtend(Lists.newArrayList(addMusicSheetApplicationExtend));
|
|
|
addMusicSheet.setIsConvertibleScore(true);
|
|
|
return addMusicSheet;
|
