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

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

@@ -100,6 +100,12 @@ public class SysMusicScoreAccompaniment {
 	@ApiModelProperty("曲目类型(SINGLE:单曲 CONCERT:合奏)")
 	private String musicSheetType;
 
+	@ApiModelProperty("是否可转谱(0:否; 1:是)")
+	private Boolean isConvertibleScore;
+
+	@ApiModelProperty("谱面类型")
+	private String scoreType;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -81,6 +81,10 @@ 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");
@@ -136,6 +140,10 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 				collect(Collectors.toMap(CbsMusicSheetCategoryWrapper.MusicSheetCategory::getId, Function.identity()));
 		for (CbsMusicSheetWrapper.MusicSheetAccApplication musicSheetApplication : applications) {
 			SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
+			record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
+			if(musicSheetApplication.getScoreType() != null){
+				record.setScoreType(musicSheetApplication.getScoreType().getCode());
+			}
 			record.setId(musicSheetApplication.getMusicSheetSoundId().toString());
 			record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 //			record.setExamSongId(accompaniment.getExamSongId());
@@ -176,6 +184,10 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Strin
 	@Override
 	public SysMusicScoreAccompaniment initSysMusicScoreAccompaniment(CbsMusicSheetWrapper.MusicSheetAccApplication musicSheetApplication){
 		SysMusicScoreAccompaniment record = new SysMusicScoreAccompaniment();
+		record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
+		if(musicSheetApplication.getScoreType() != null){
+			record.setScoreType(musicSheetApplication.getScoreType().getCode());
+		}
 //		record.setType(accompaniment.getType());
 		record.setRankIds("FREE".equals(musicSheetApplication.getPaymentType()) ? null : "1");
 //		record.setClientType(accompaniment.getClientType());