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

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

@@ -1,6 +1,5 @@
 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;
@@ -137,7 +136,7 @@ public class SysMusicScore {
 	private Boolean isConvertibleScore;
 
 	@ApiModelProperty("谱面类型")
-	private EDefaultScoreType scoreType;
+	private String scoreType;
 	@Override
 	public String toString() {
 		return ToStringBuilder.reflectionToString(this);

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

@@ -1,6 +1,5 @@
 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;
@@ -53,5 +52,5 @@ public class SysExamSongQueryInfo extends QueryInfo {
     private Boolean isConvertibleScore;
 
     @ApiModelProperty("谱面类型")
-    private EDefaultScoreType scoreType;
+    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;
 
 /**
  * 曲谱表
@@ -225,7 +220,7 @@ public class MusicSheetWrapper {
         private Boolean isConvertibleScore;
 
         @ApiModelProperty("谱面类型")
-        private EDefaultScoreType scoreType;
+        private String scoreType;
     }
 
     @Data

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

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

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

@@ -41,7 +41,7 @@
 		<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"/>
+		<result column="score_type_" property="scoreType"/>
 	</resultMap>
 	
 	<!-- 根据主键查询一条记录 -->
@@ -262,7 +262,7 @@
 				AND ses.is_convertible_score_ = #{isConvertibleScore}
 			</if>
 			<if test="scoreType != null">
-				AND ses.score_type_ = #{scoreType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+				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_ = '' OR ses.music_sheet_type_ = 'CONCERT')