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

# Conflicts:
#	pom.xml

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

@@ -131,6 +131,12 @@ public class SysMusicScore {
 
 	//独奏、合奏
 	private String musicSheetType;
+
+	@ApiModelProperty("是否可转谱(0:否; 1:是)") // 固定调，首调 有值 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/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/dal/page/SysExamSongQueryInfo.java

@@ -47,4 +47,10 @@ public class SysExamSongQueryInfo extends QueryInfo {
     private Boolean enable;
 
     private String organId;
+
+    @ApiModelProperty("是否可转谱(0:否; 1:是)")
+    private Boolean isConvertibleScore;
+
+    @ApiModelProperty("谱面类型")
+    private String scoreType;
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/wrapper/MusicSheetWrapper.java

@@ -1,20 +1,12 @@
 package com.dayaedu.cbs.domain.wrapper;
 
 import com.alibaba.fastjson.JSON;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.dayaedu.cbs.common.enums.music.*;
 import com.dayaedu.cbs.common.enums.school.EMusicSheetType;
 import com.dayaedu.cbs.openfeign.wrapper.music.CbsMusicSheetWrapper;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
-
-import java.math.BigDecimal;
-import java.util.Date;
-import java.util.List;
-import java.util.Optional;
-
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -23,6 +15,9 @@ import org.apache.commons.lang3.StringUtils;
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
+import java.util.Date;
+import java.util.List;
+import java.util.Optional;
 
 /**
  * 曲谱表
@@ -220,6 +215,12 @@ public class MusicSheetWrapper {
 
         @ApiModelProperty("收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
         private String paymentType;
+
+        @ApiModelProperty("是否可转谱(0:否; 1:是)")
+        private Boolean isConvertibleScore;
+
+        @ApiModelProperty("谱面类型")
+        private EDefaultScoreType scoreType;
     }
 
     @Data

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());

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

@@ -233,6 +233,8 @@ public class SysMusicScoreServiceImpl extends BaseServiceImpl<Integer, SysMusicS
         record.setMidiUrl(musicSheetApplication.getMidiFileUrl());
         record.setOrder(musicSheetApplication.getSortNo());
         record.setEnableEvaluation(musicSheetApplication.getIsEvaluated());
+        record.setIsConvertibleScore(musicSheetApplication.getIsConvertibleScore());
+        record.setScoreType(musicSheetApplication.getScoreType().getCode());
         if(musicSheetApplication.getMusicSheetType() == EMusicSheetType.CONCERT){
             record.setSubjectName("");
         }else {

mec-biz/src/main/resources/config/mybatis/SysMusicScoreMapper.xml

@@ -40,13 +40,14 @@
 		<result column="create_time_" property="createTime" />
 		<result column="ext_config_json_" property="extConfigJson" />
 		<result column="ext_style_config_json_" property="extStyleConfigJson" />
+		<result column="is_convertible_score_" property="isConvertibleScore" />
+		<result column="score_type_" property="scoreType"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScore" >
 		SELECT * FROM sys_music_score WHERE id_ = #{id} 
 	</select>
-	
 
 	
 	<!-- 向数据库增加一条记录 -->
@@ -183,7 +184,8 @@
 			update sys_music_score set music_score_categories_id_ = #{item.musicSheetCategoryId},
 			client_type_ = 'SMART_PRACTICE',type_ = 'COMMON',
 			rank_ids_ = CASE WHEN #{item.paymentType} = 'FREE' THEN NULL ELSE '1' END,
-			order_ = #{item.sortNo},del_flag_ = 0,show_flag_ = #{item.status}
+			order_ = #{item.sortNo},del_flag_ = 0,show_flag_ = #{item.status},
+			score_type_ = #{item.scoreType},is_convertible_score_ = #{item.isConvertibleScore}
 			<if test="item.musicSheetUpdate != null">
 				,name_ = #{item.musicSheetUpdate.name},
 				subject_ids_ = #{item.musicSheetUpdate.subjectIds},
@@ -218,7 +220,8 @@
 	<insert id="batchInsert">
 		insert into sys_music_score
 		(music_score_categories_id_,client_type_,type_,rank_ids_,order_
-		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_,music_sheet_type_)
+		,name_,subject_ids_,speed_,enable_evaluation_,play_mode_,show_flag_,cbs_music_sheet_id_,music_sheet_type_,
+		score_type_,is_convertible_score_)
 		values
 		<foreach collection="vos" item="item" separator=",">
 			(#{item.musicSheetCategoryId},
@@ -230,7 +233,8 @@
 			#{item.musicSheetUpdate.playSpeed},
 			#{item.musicSheetUpdate.canEvaluate},
 			#{item.musicSheetUpdate.playMode},0,
-			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType}
+			#{item.musicSheetId},#{item.musicSheetUpdate.musicSheetType},
+			#{item.scoreType},#{item.isConvertibleScore}
 			)
 		</foreach>
 	</insert>
@@ -257,11 +261,17 @@
 			<if test="showFlag != null">
 				AND ses.show_flag_ = #{showFlag}
 			</if>
+			<if test="isConvertibleScore != null">
+				AND ses.is_convertible_score_ = #{isConvertibleScore}
+			</if>
+			<if test="scoreType != null and scoreType != ''">
+				AND ses.score_type_ = #{scoreType}
+			</if>
 			<if test="subjectId != null">
-				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '')
+				AND (FIND_IN_SET(#{subjectId},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT')
 			</if>
 			<if test="subjectIds != null and subjectIds != ''">
-				AND (FIND_IN_SET(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '')
+				AND (FIND_IN_SET(#{subjectIds},ses.subject_ids_) OR ses.subject_ids_ IS NULL OR ses.subject_ids_ = '' OR ses.music_sheet_type_ = 'CONCERT')
 			</if>
 			<if test="clientType != null">
 				AND ses.client_type_ = #{clientType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}

pom.xml

@@ -26,7 +26,7 @@
 		<docker.registry.repository>127.0.0.1:5000</docker.registry.repository>
 		<docker.maven.plugin.version>1.2.2</docker.maven.plugin.version>
 		<com.microsvc.toolkit.version>1.0.7</com.microsvc.toolkit.version>
-        <cbs.version>1.0.11</cbs.version>
+        <cbs.version>1.0.12</cbs.version>
 	</properties>
 
 	<dependencyManagement>