Merge branch 'fix/1223' into develop-new

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/wrapper/MusicPracticeRecordWrapper.java

@@ -483,6 +483,8 @@ public class MusicPracticeRecordWrapper {
         private Boolean delFlag;
 
 
+        @ApiModelProperty("是否隐藏评测记录 0：不隐藏 1：隐藏")
+        private Boolean hiddenFlag;
         @ApiModelProperty("曲目评测来源 TENANT 机构 PLATFORM 平台")
         private String providerType;
 
@@ -521,6 +523,7 @@ public class MusicPracticeRecordWrapper {
                 .updateTime(record.getCreateTime())
                 .createTime(record.getCreateTime())
                 .delFlag(record.getDelFlag())
+                .hiddenFlag(record.getHiddenFlag())
                 .providerType(record.getProviderType())
                 .build();
         }
@@ -558,6 +561,7 @@ public class MusicPracticeRecordWrapper {
             sysMusicCompareRecord.setDelFlag(this.delFlag);
             sysMusicCompareRecord.setPlayRate(this.playRate);
             sysMusicCompareRecord.setProviderType(this.providerType ==null?"PLATFORM":this.providerType);
+            sysMusicCompareRecord.setHiddenFlag(this.hiddenFlag);
 
             return sysMusicCompareRecord;
 

cooleshow-user/user-biz/src/main/resources/config/mybatis/SysMusicCompareRecordMapper.xml

@@ -63,7 +63,7 @@
 		       #{score},#{intonation},#{cadence},#{integrity},
 		       #{recordFilePath},#{videoFilePath},#{deviceType,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler},#{clientId},#{playTime},#{speed},#{monday},
 		       #{sourceTime},#{feature,typeHandler=com.yonge.toolset.mybatis.dal.CustomEnumTypeHandler}, NOW(), NOW(),#{partIndex},#{customConfiguration},#{tenantId},
-        #{practiceTime},#{practiceSource},#{resultAnalyze},#{headphoneFlag},#{instrumentId},#{hiddenFlag},#{delFlag},#{playRate},#{providerType})
+        #{practiceTime},#{practiceSource},#{resultAnalyze},#{headphoneFlag},#{instrumentId},ifnull(#{hiddenFlag},0),ifnull(#{delFlag},0),#{playRate},#{providerType})
 	</insert>
 
 	<!-- 根据主键查询一条记录 -->