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

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

@@ -3,13 +3,16 @@ package com.ym.mec.biz.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.dayaedu.cbs.common.enums.music.EMusicSourceType;
+import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.service.CbsMusicSheetService;
 import com.dayaedu.cbs.openfeign.wrapper.music.*;
 import com.microsvc.toolkit.common.response.paging.PageInfo;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.ym.mec.biz.dal.dao.SysUserTenantDao;
+import com.ym.mec.biz.dal.entity.Instrument;
 import com.ym.mec.biz.dal.entity.Subject;
 import com.ym.mec.biz.dal.entity.SysMusicScore;
+import com.ym.mec.biz.service.InstrumentService;
 import com.ym.mec.biz.service.SubjectService;
 import com.ym.mec.biz.service.SysMusicScoreCategoriesService;
 import com.ym.mec.biz.service.SysMusicScoreService;
@@ -38,6 +41,8 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
     private SubjectService subjectService;
     @Resource
     private SysUserTenantDao sysUserTenantDao;
+    @Resource
+    private InstrumentService instrumentService;
 
     @Override
     @Transactional(rollbackFor = Exception.class)
@@ -117,6 +122,14 @@ public class CbsMusicSheetServiceImpl implements CbsMusicSheetService {
     }
 
     public boolean updateMusicSheet(CbsMusicSheetApiWrapper.MusicSheetUpdate musicSheetUpdate) {
+        if(StringUtils.isNotBlank(musicSheetUpdate.getMusicalInstrumentIds())) {
+            List<Instrument> instruments = instrumentService.lambdaQuery()
+                    .in(Instrument::getId, Arrays.stream(musicSheetUpdate.getMusicalInstrumentIds().split(","))
+                            .map(Integer::parseInt).collect(Collectors.toList())).list();
+            if (CollectionUtils.isNotEmpty(instruments)) {
+                musicSheetUpdate.setSubjectIds(instruments.stream().map(e -> e.getSubjectId().toString()).distinct().collect(Collectors.joining(",")));
+            }
+        }
         sysMusicScoreService.getDao().updateMusicSheet(musicSheetUpdate);
         return true;
     }

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

@@ -98,7 +98,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
 				record.setId(accompaniment.getId());
 				record.setType(accompaniment.getType());
-				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? "1" : null);
+				record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 				record.setClientType(accompaniment.getClientType());
 				record.setExamSongId(accompaniment.getExamSongId());
 				record.setCbsMusicSheetId(musicSheetApplication.getId().toString());
@@ -120,7 +120,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				record.setXmlUrl(musicSheetApplication.getXmlFileUrl());
 				record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
 				record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
-				record.setIsOpenMetronome(!musicSheetApplication.getIsUseSystemBeat() && musicSheetApplication.getIsPlayBeat());
+				record.setIsOpenMetronome(musicSheetApplication.getIsUseSystemBeat());
 				List<CbsMusicSheetWrapper.MusicSheetAccompaniment> accompanimentList = musicSheetApplication.getMusicSheetAccompanimentList();
 				if (CollectionUtils.isNotEmpty(accompanimentList)) {
 					record.setMetronomeUrl(accompanimentList.get(0).getAudioFileUrl());

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

@@ -455,7 +455,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                 int i = 0;
                 for (SysMusicScoreAccompaniment sheetAccompaniment : accList) {
                     CbsMusicSheetWrapper.MusicSheetSound musicSheetSound = new CbsMusicSheetWrapper.MusicSheetSound();
-                    if (sheetAccompaniment.getIsOpenMetronome()){
+                    if (sheetAccompaniment.getIsOpenMetronome() != null && sheetAccompaniment.getIsOpenMetronome()){
                         musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMp3Url());
                     } else {
                         musicSheetSound.setAudioFileUrl(sheetAccompaniment.getMetronomeMp3Url());