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

# Conflicts:
#	pom.xml

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

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.entity;
 
+import com.dayaedu.cbs.common.enums.music.EDefaultScoreType;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.biz.dal.enums.ExamSongTypeEnum;
 import com.ym.mec.common.enums.BaseEnum;
@@ -131,6 +132,12 @@ public class SysMusicScore {
 
 	//独奏、合奏
 	private String musicSheetType;
+
+	@ApiModelProperty("是否可转谱(0:否; 1:是)") // 固定调，首调 有值 1
+	private Boolean isConvertibleScore;
+
+	@ApiModelProperty("谱面类型")
+	private EDefaultScoreType scoreType;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

mec-biz/src/main/java/com/ym/mec/biz/dal/page/SysExamSongQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.dayaedu.cbs.common.enums.music.EDefaultScoreType;
 import com.ym.mec.biz.dal.enums.ClientTypeEnum;
 import com.ym.mec.common.page.QueryInfo;
 import io.swagger.annotations.ApiModelProperty;
@@ -47,4 +48,10 @@ public class SysExamSongQueryInfo extends QueryInfo {
     private Boolean enable;
 
     private String organId;
+
+    @ApiModelProperty("是否可转谱(0:否; 1:是)")
+    private Boolean isConvertibleScore;
+
+    @ApiModelProperty("谱面类型")
+    private EDefaultScoreType scoreType;
 }

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

@@ -220,6 +220,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/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());
         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" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
 	<select id="get" resultMap="SysMusicScore" >
 		SELECT * FROM sys_music_score WHERE id_ = #{id} 
 	</select>
-	
 
 	
 	<!-- 向数据库增加一条记录 -->
@@ -257,11 +258,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 ses.score_type_ = #{scoreType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+			</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>