Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/req/TeacherMusicSheetAuditReq.java

@@ -21,7 +21,7 @@ public class TeacherMusicSheetAuditReq {
     @NotNull(message = "曲目id不能为空 ")
     private Long musicSheetId;
 
-    @ApiModelProperty(value = "审批状态（2：通过，3：不通过）",required = true)
+    @ApiModelProperty(value = "审批状态（PASS：通过，UNPASS：不通过）",required = true)
     @NotNull(message = "审批状态不为空 ")
     private AuthStatusEnum authStatus;
 

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

@@ -37,7 +37,7 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty("曲目状态（0：停用，1：启用））")
     private YesOrNoEnum state;
 
-    @ApiModelProperty("曲目审核状态(0:待审核;1:通过;2:未通过)")
+    @ApiModelProperty("曲目审核状态(DOING:待审核;PASS:通过;UNPASS:未通过)")
     private AuthStatusEnum auditStatus;
 
     @ApiModelProperty(value = "创建人id （老师id）")

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

@@ -36,7 +36,7 @@ public class TeacherMusicSheetAuditSearch extends QueryInfo{
     private Date endTime;
 
 
-    @ApiModelProperty(value = "审核状态  0、未申请 1、审核中 2、通过 3、不通过")
+    @ApiModelProperty(value = "审核状态  UNPAALY、未申请 DOING、审核中 PASS、通过 UNPASS、不通过")
     private AuthStatusEnum authStatus;
 
     @ApiModelProperty(value = "假删除 0 : 未删除 1：已删除",hidden = true)

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

@@ -64,7 +64,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
             where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+            where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         <where>
@@ -201,7 +202,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+        where find_in_set(s.id_,t.music_subject_)  and s.del_flag_ = 0) as subjectNames
         <if test="param.studentId != null">
             ,if(mf.id_ is not null,1,0) as favorite
         </if>
@@ -221,7 +223,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+        where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_
         left join music_sheet_purchase_record mspr on mspr.music_sheet_id_ = t.id_
@@ -240,7 +243,8 @@
         ,su.avatar_ as addUserAvatar
         ,(select group_concat(mt.name_) from music_tag mt
         where find_in_set(mt.id_,t.music_tag_) and mt.del_flag_ = 0) as musicTagNames
-        ,(select group_concat(s.name_) from subject s where find_in_set(s.id_,t.music_subject_) ) as subjectNames
+        ,(select group_concat(s.name_) from subject s
+        where find_in_set(s.id_,t.music_subject_) and s.del_flag_ = 0 ) as subjectNames
         ,if(mf.id_ is not null,1,0) as favorite
         from music_sheet t
         left join sys_user su on t.create_by_ = su.id_