zouxuan hai 8 meses
pai
achega
0e3dca487e

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

@@ -23,7 +23,7 @@ public class SysMusicScoreAccompaniment {
 	private String cbsMusicSheetId;
 	
 	/**  */
-	private Integer subjectId;
+	private String subjectId;
 
 	/**  */
 	private String subjectName;

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

@@ -216,6 +216,11 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				record.setIsShowFingering(musicSheetApplication.getIsShowFingering());
 				record.setIsScoreRender(musicSheetApplication.getIsScoreRender());
 				record.setDefaultScoreRender(musicSheetApplication.getDefaultScoreRender());
+				if(StringUtils.isNotEmpty(accompaniment.getSubjectId())) {
+					//获取第一个声部
+					String[] subjectIds = accompaniment.getSubjectId().split(",");
+					record.setSubjectId(subjectIds[0]);
+				}
 				childAccompaniments.add(record);
 			}
 			result.addAll(childAccompaniments);

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

@@ -521,7 +521,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
                     }
                     musicSheetSound.setTrack(sheetAccompaniment.getTrack());
                     if (sheetAccompaniment.getSubjectId() != null) {
-                        Subject subject = subjectService.get(sheetAccompaniment.getSubjectId());
+                        Subject subject = subjectService.get(Integer.parseInt(sheetAccompaniment.getSubjectId()));
                         if (Objects.nonNull(subject)) {
                             //获取关联的乐器
                             Instrument one = instrumentService.lambdaQuery().eq(Instrument::getSubjectId, subject.getId()).one();

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/SysMusicScoreAccompanimentMapper.xml

@@ -101,7 +101,7 @@
 		    ses.name_,ses.type_,ses.url_,ses.id_ exam_song_id_,
 		       ses.cbs_music_categories_id_ categories_id_,ses.client_type_,
 		ses.rank_ids_,ses.render_from_,ses.enable_evaluation_,ses.metronome_url_,ses.midi_url_,ses.play_mode_,ses.render_from_,
-		ses.ext_config_json_,ses.ext_style_config_json_,ses.cbs_music_sheet_id_
+		ses.ext_config_json_,ses.ext_style_config_json_,ses.cbs_music_sheet_id_,ses.subject_ids_ subject_id_
 		FROM sys_music_score ses
 		<include refid="queryPageSql"/>
 		ORDER BY ses.order_,ses.name_