Merge branch 'fix/1104-msuic-img' into test

# Conflicts:
#	mec-biz/src/main/java/com/ym/mec/biz/dal/entity/SysMusicScore.java

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

@@ -178,6 +178,15 @@ public class SysMusicScore {
 	@ApiModelProperty("伴奏固定调PDF文件")
 	private String accJianPdfUrl;
 
+	@ApiModelProperty("五线谱图片")
+	private String musicImg;
+
+	@ApiModelProperty("首调图片")
+	private String musicFirstImg;
+
+	@ApiModelProperty("固定调图片")
+	private String musicJianImg;
+
     @ApiModelProperty("曲目状态 ")
 	private List<SysMusicScoreAccompaniment> background;
 
@@ -196,4 +205,13 @@ public class SysMusicScore {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
+	public SysMusicScore musicFirstImg(String musicFirstImg) {
+		this.musicFirstImg = musicFirstImg;
+		return this;
+	}
+
+	public SysMusicScore musicImg(String musicImg) {
+		this.musicImg = musicImg;
+		return this;
+	}
 }

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

@@ -214,6 +214,12 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setPlayMode(SysMusicScore.PlayMode.valueOf(musicSheetApplication.getPlayMode().getCode()));
         record.setExtConfigJson(musicSheetApplication.getExtConfigJson());
         record.setExtStyleConfigJson(musicSheetApplication.getExtStyleConfigJson());
+
+        // 设置曲目五线谱、首调、固定调谱面图片
+        record.musicImg(musicSheetApplication.getMusicImg())
+            .musicFirstImg(musicSheetApplication.getMusicFirstImg())
+            .setMusicJianImg(musicSheetApplication.getMusicJianImg());
+
         record.setShowFlag(musicSheetApplication.getStatus()?1:0);
 //        if(musicSheetApplication.getMusicSheetCategoryId() != null){
 //            record.setMusicScoreCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());