Merge branch 'feature/250324' into dev

mec-application/src/main/java/com/ym/mec/student/controller/MusicPracticeRecordController.java

@@ -98,6 +98,7 @@ public class MusicPracticeRecordController {
 
         // 新增数据
         MusicPracticeRecordWrapper.MusicPracticeRecord from = MusicPracticeRecordWrapper.MusicPracticeRecord.from(record.jsonString());
+        from.setVersion(2);
         if (record.getDelFlag() !=null && record.getDelFlag()) {
             from.setDelFlag(false);
             from.setHiddenFlag(true);

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

@@ -107,6 +107,8 @@ public class SysMusicCompareRecord extends BaseEntity {
 
     private Long lessonDetailId;
 
+	private Integer version;
+
 	public SysMusicCompareRecord(FeatureType feature) {
 		this.feature = feature;
 	}

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

@@ -321,6 +321,9 @@ public class MusicPracticeRecordWrapper {
 
         @ApiModelProperty("作业详情ID")
         private Long lessonDetailId;
+
+
+        private Integer version;
         public String jsonString() {
             return JSON.toJSONString(this);
         }
@@ -487,6 +490,10 @@ public class MusicPracticeRecordWrapper {
         @ApiModelProperty("作业详情ID")
         private Long lessonDetailId;
 
+
+        @ApiModelProperty("版本号")
+        private Integer version;
+
         public static MusicPracticeRecordWrapper.Entity toEntity(SysMusicCompareRecord record) {
             if (record ==null) {
                 return null;
@@ -522,6 +529,7 @@ public class MusicPracticeRecordWrapper {
                 .updateTime(record.getCreateTime())
                 .createTime(record.getCreateTime())
                 .delFlag(record.getDelFlag())
+                .version(record.getVersion())
                 .build();
         }
 
@@ -558,6 +566,7 @@ public class MusicPracticeRecordWrapper {
             sysMusicCompareRecord.setDelFlag(this.delFlag);
             sysMusicCompareRecord.setPlayRate(this.playRate);
             sysMusicCompareRecord.setLessonDetailId(this.lessonDetailId);
+            sysMusicCompareRecord.setVersion(this.version);
 
             return sysMusicCompareRecord;
 

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

@@ -41,6 +41,7 @@
         <result column="hidden_flag_" property="hiddenFlag"/>
         <result column="del_flag_" property="delFlag"/>
         <result column="play_rate_" property="playRate"/>
+        <result column="version_" property="version"/>
 	</resultMap>
 
 	<!-- 根据主键查询一条记录 -->
@@ -58,12 +59,12 @@
 		INSERT INTO sys_music_compare_record (id_,user_id_,sys_music_score_id_,heard_level_,behavior_id_,score_data_,score_,intonation_,cadence_,integrity_,
 		                                      record_file_path_,video_file_path_,device_type_,client_id_,play_time_,speed_,monday_,
 												source_time_,feature_,create_time_,create_date_,update_time_,part_index_,tenant_id_,subject_id_,
-        custom_configuration_,practice_time_,practice_source_,result_analyze_,headphone_flag_,instrument_id_,hidden_flag_,del_flag_,play_rate_,lesson_detail_id_)
+        custom_configuration_,practice_time_,practice_source_,result_analyze_,headphone_flag_,instrument_id_,hidden_flag_,del_flag_,play_rate_,lesson_detail_id_,version_)
 		VALUES(#{id},#{userId},#{sysMusicScoreId},#{heardLevel,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{behaviorId},#{scoreData},
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
 		       #{sourceTime},#{feature,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}, #{createTime}, #{createDate}, NOW(),#{partIndex},#{tenantId},#{subjectId}
-            ,#{customConfiguration},#{practiceTime},#{practiceSource},#{resultAnalyze},#{headphoneFlag},#{instrumentId},#{hiddenFlag},#{delFlag},#{playRate},#{lessonDetailId})
+            ,#{customConfiguration},#{practiceTime},#{practiceSource},#{resultAnalyze},#{headphoneFlag},#{instrumentId},#{hiddenFlag},#{delFlag},#{playRate},#{lessonDetailId},#{version})
 	</insert>
 	<insert id="init">
 		insert into sys_music_compare_day_data (user_id_, day_, train_num_, train_time_, tenant_id_)