Merge remote-tracking branch 'origin/dev_v1_1_20220720' into dev_v1_1_20220720

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

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.biz.dal.dto.search;
 
+import com.yonge.cooleshow.biz.dal.enums.ClientEnum;
 import com.yonge.cooleshow.common.enums.YesOrNoEnum;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -21,6 +22,9 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     @ApiModelProperty("专辑分页参数")
     private Integer albumRow = 3;
 
+    @ApiModelProperty(value = "用户类型",hidden = true)
+    private ClientEnum userType;
+
 
     @ApiModelProperty(value = "是否审核时可见 （0:否  1：是）",hidden = true)
     private YesOrNoEnum auditVersion;
@@ -35,6 +39,14 @@ public class StudentMusicSheetSearch  extends MusicSheetSearch{
     @ApiModelProperty(value = "查看我自己的曲目",required = true)
     private Boolean myself = true;
 
+    public ClientEnum getUserType() {
+        return userType;
+    }
+
+    public void setUserType(ClientEnum userType) {
+        this.userType = userType;
+    }
+
     public Boolean getMyself() {
         return myself;
     }

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

@@ -300,6 +300,9 @@
                 and mspr.student_id_ = #{param.studentId}
                 and mspr.order_status_ = 'PAID'
             </if>
+            <if test="param.userType != null">
+                and mspr.client_type_ = #{param.userType}
+            </if>
         </where>
         order by  mspr.id_ desc
     </select>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/MusicSheetController.java

@@ -167,6 +167,7 @@ public class MusicSheetController extends BaseController {
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setUserType(ClientEnum.STUDENT);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }

cooleshow-user/user-teacher/src/main/java/com/yonge/cooleshow/teacher/controller/MusicSheetController.java

@@ -160,6 +160,7 @@ public class MusicSheetController extends BaseController {
         search.setStudentId(sysUser.getId());
         search.setState(YesOrNoEnum.YES);
         search.setAuditStatus(AuthStatusEnum.PASS);
+        search.setUserType(ClientEnum.TEACHER);
         IPage<MusicSheetVo> sheetVoIPage = musicSheetService.myMusic(PageUtil.getPage(query),search);
         return succeed(PageUtil.pageInfo(sheetVoIPage));
     }