Merge branch 'ponline' into online

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/MusicSheetSearch.java

@@ -91,6 +91,9 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty("是否可以转简谱（0:否，1：是）")
     private YesOrNoEnum notation;
 
+    @ApiModelProperty("数据修复标识")
+    private Boolean DataCorrect;
+
     public MusicSortType getMusicSortType() {
         return musicSortType;
     }
@@ -270,4 +273,12 @@ public class MusicSheetSearch  extends QueryInfo{
     public void setNotation(YesOrNoEnum notation) {
         this.notation = notation;
     }
+
+    public Boolean getDataCorrect() {
+        return Optional.ofNullable(DataCorrect).filter(x -> x).orElse(null);
+    }
+
+    public void setDataCorrect(Boolean dataCorrect) {
+        DataCorrect = dataCorrect;
+    }
 }

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

@@ -111,6 +111,9 @@
             <if test="param.notation">
                 AND t.notation_ = #{param.notation}
             </if>
+            <if test="param.DataCorrect != null">
+                AND t.correct_time_ IS NULL
+            </if>
         </where>
         order by
         <if test="param.myself == null or param.myself == false ">