Merge branch 'feature_HW_20230331' of http://git.dayaedu.com/yonge/mec into master_saas

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.ym.mec.biz.dal.enums.HardLevelEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -16,7 +17,7 @@ public class LessonExaminationDetailDto{
     private Long musicScoreId;
 
     @ApiModelProperty(value = "评测难度")
-    private String heardLevel;
+    private HardLevelEnum heardLevel;
 
     @ApiModelProperty(value = "分谱")
     private Integer partIndex;

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.ym.mec.biz.dal.enums.HardLevelEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -27,7 +28,7 @@ public class StudentLessonExaminationDetailDto {
     private Integer musicScoreId;
 
     @ApiModelProperty(value = "评测难度")
-    private String heardLevel;
+    private HardLevelEnum heardLevel;
 
     @ApiModelProperty(value = "练习最高分数")
     private Integer trainingScore;

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

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 
+import com.ym.mec.biz.dal.enums.HardLevelEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -26,5 +27,8 @@ public class StudentLessonExaminationDetailDto1 {
 
     @ApiModelProperty(value = "均摊总分")
     private Integer avgScore;
+
+    @ApiModelProperty(value = "评测难度")
+    private HardLevelEnum heardLevel;
 }
 

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

@@ -5,6 +5,7 @@ import java.util.Date;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.ym.mec.biz.dal.enums.HardLevelEnum;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -39,7 +40,7 @@ public class StudentLessonExaminationDetail implements Serializable {
 
     @TableField("heard_level_")
     @ApiModelProperty(value = "评测难度")
-    private String heardLevel;
+    private HardLevelEnum heardLevel;
 
     @TableField("standard_flag_")
     @ApiModelProperty(value = "是否达标")

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/GroupStatusEnum.java

@@ -39,4 +39,5 @@ public enum GroupStatusEnum implements BaseEnum<String, GroupStatusEnum> {
 
     public void setDesc(String desc) {
         this.desc = desc;
-    }}
+    }
+}

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/HardLevelEnum.java

@@ -0,0 +1,35 @@
+package com.ym.mec.biz.dal.enums;
+
+import com.ym.mec.common.enums.BaseEnum;
+
+public enum HardLevelEnum implements BaseEnum<String, HardLevelEnum> {
+	BEGINNER("BEGINNER","入门级"),
+	ADVANCED("ADVANCED","进阶级"),
+	PERFORMER("PERFORMER","大师级");
+
+	private String code;
+
+	private String desc;
+
+	HardLevelEnum(String code, String desc) {
+		this.code = code;
+		this.desc = desc;
+	}
+
+	@Override
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getDesc() {
+		return desc;
+	}
+
+	public void setDesc(String desc) {
+		this.desc = desc;
+	}
+}

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

@@ -6,7 +6,7 @@
         <result column="user_id_" property="userId"/>
         <result column="lesson_examination_id_" property="lessonExaminationId"/>
         <result column="music_score_id_" property="musicScoreId"/>
-        <result column="heard_level_" property="heardLevel"/>
+        <result column="heard_level_" property="heardLevel" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="standard_flag_" property="standardFlag"/>
         <result column="training_score_" property="trainingScore"/>
         <result column="standard_score_" property="standardScore"/>
@@ -24,7 +24,7 @@
                                                       avg_score_, part_index_)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.userId}, #{entity.lessonExaminationId},#{entity.musicScoreId}, #{entity.heardLevel},
+            (#{entity.userId}, #{entity.lessonExaminationId},#{entity.musicScoreId}, #{entity.heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
              #{entity.standardScore}, #{entity.avgScore},#{entity.partIndex})
         </foreach>
     </insert>

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

@@ -79,11 +79,12 @@
             <result property="actualAvgScore" column="actual_avg_score_"/>
             <result property="avgScore" column="avg_score_"/>
             <result property="musicScoreName" column="musicScoreName"/>
+            <result property="heardLevel" column="heard_level_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         </collection>
     </resultMap>
     <select id="queryStudentPage" resultMap="StudentLessonExaminationDtoMap">
         select sle.user_id_,su.username_,su.phone_,sb.name_ subjectName,sle.training_score_,
-               sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,sled.avg_score_
+               sms.name_ musicScoreName,sled.actual_avg_score_,sled.standard_score_,sled.training_score_,sled.avg_score_,sled.heard_level_
         from student_lesson_examination sle
         left join student_lesson_examination_detail sled ON sled.lesson_examination_id_ = sle.lesson_examination_id_ AND sled.user_id_ = sle.user_id_
         left join sys_music_score sms ON sms.id_ = sled.music_score_id_