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

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

@@ -1,7 +1,9 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.ym.mec.biz.dal.entity.SysMusicScore.PlayMode;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
@@ -95,6 +97,9 @@ public class SysMusicScoreAccompaniment {
 	
 	private String extStyleConfigJson;
 
+	@ApiModelProperty("曲目类型(SINGLE:单曲 CONCERT:合奏)")
+	private String musicSheetType;
+
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -109,6 +109,7 @@ public class SysMusicScoreAccompanimentServiceImpl extends BaseServiceImpl<Integ
 				if(musicSheetApplication.getMusicSheetCategoryId() != null){
 					record.setCategoriesId(musicSheetApplication.getMusicSheetCategoryId().intValue());
 				}
+				record.setMusicSheetType(musicSheetApplication.getMusicSheetType().getCode());
 				record.setParentCategoriesId(accompaniment.getParentCategoriesId());
 				record.setExamSongName(musicSheetApplication.getName());
 				record.setCategoriesName(musicSheetApplication.getMusicSheetCategoryName());

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

@@ -431,10 +431,19 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheet.setRemark(from.getMuseScoreMemo());
         addMusicSheet.setIsPlayBeat(true);
 
-        if(Arrays.stream(categoryIds.split(",")).anyMatch(e->e.equals(from.getMusicScoreCategoriesId().toString()))){
-            addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
-        }else {
-            addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);
+        String extConfigJson = from.getExtConfigJson();
+        if(StringUtils.isNotEmpty(extConfigJson)){
+            Integer multitrack = JSONObject.parseObject(extConfigJson).getInteger("multitrack");
+            if(multitrack != null && multitrack > 1){
+                addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
+            }
+        }
+        if(addMusicSheet.getMusicSheetType() == null){
+            if(Arrays.stream(categoryIds.split(",")).anyMatch(e->e.equals(from.getMusicScoreCategoriesId().toString()))){
+                addMusicSheet.setMusicSheetType(EMusicSheetType.CONCERT);
+            }else {
+                addMusicSheet.setMusicSheetType(EMusicSheetType.SINGLE);
+            }
         }
         addMusicSheet.setIsEvaluated(from.isEnableEvaluation());
         addMusicSheet.setIsConvertibleScore(true);
@@ -446,7 +455,7 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         addMusicSheet.setAudioType(EAudioType.HOMEMODE);
         addMusicSheet.setAvailableType(EMusicAvailableType.ORG);
         addMusicSheet.setSourceType(EMusicSourceType.PLATFORM);
-        addMusicSheet.setStatus(true);
+        addMusicSheet.setStatus(from.getShowFlag() == 1);
 
         String tracks = "";
         // 伴奏，原音 扩展信息