fix单声部曲目多声轨

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/MusicScoreDto.java

@@ -5,6 +5,7 @@ import com.ym.mec.biz.dal.entity.SysMusicScoreAccompaniment;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.util.List;
+import java.util.Optional;
 
 public class MusicScoreDto {
     @ApiModelProperty(value = "曲库", required = false)
@@ -13,6 +14,9 @@ public class MusicScoreDto {
     @ApiModelProperty(value = "曲库伴奏", required = false)
     private List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments;
 
+    @ApiModelProperty("多声轨")
+    private Boolean multitrack;
+
     private List<Integer> delExamSongAccompanimentIds;
 
     public List<Integer> getDelExamSongAccompanimentIds() {
@@ -38,4 +42,12 @@ public class MusicScoreDto {
     public void setSysMusicScoreAccompaniments(List<SysMusicScoreAccompaniment> sysMusicScoreAccompaniments) {
         this.sysMusicScoreAccompaniments = sysMusicScoreAccompaniments;
     }
+
+    public Boolean getMultitrack() {
+        return Optional.ofNullable(multitrack).orElse(false);
+    }
+
+    public void setMultitrack(Boolean multitrack) {
+        this.multitrack = multitrack;
+    }
 }

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

@@ -90,13 +90,14 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         if (sysMusicScoreAccompaniments != null && sysMusicScoreAccompaniments.size() > 0) {
             List<Integer> subjectIdList = sysMusicScoreAccompaniments.stream().map(e -> e.getSubjectId()).collect(Collectors.toList());
             subjectIdList.removeAll(Collections.singleton(null));
+
             if (subjectIdList.size() > 0) {
                 List<Integer> idList = sysMusicScoreAccompaniments.stream().map(e -> e.getId()).collect(Collectors.toList());
                 List<Integer> subjectIds = sysMusicScoreAccompanimentDao.findSubjectByMusicScoreId(sysMusicScore.getId(), idList);
                 int subjectSize = subjectIds.size() + subjectIdList.size();
                 subjectIdList.addAll(subjectIds);
                 int size = new HashSet<>(subjectIdList).size();
-                if (size < subjectSize) {
+                if (size < subjectSize && !musicScoreDto.getMultitrack()) {
                     throw new BizException("操作失败：请勿提交重复的伴奏声部");
                 }
             }