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

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

@@ -57,7 +57,7 @@ public class MusicSheetSearch  extends QueryInfo{
     @ApiModelProperty(value = "收费类型(FREE:免费;VIP:会员;CHARGE:单曲收费)")
     private ChargeTypeEnum chargeType;  //收费类型(0:免费;1:会员;2:单曲收费)
 
-    @ApiModelProperty(value = "查看我自己的曲目",required = true)
+    @ApiModelProperty(value = "查看我自己的曲目")
     private Boolean myself;
 
 

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

@@ -82,32 +82,32 @@
     </select>
 
     <select id="selectActivityUser" resultType="com.yonge.cooleshow.biz.dal.vo.ActivityMusicVo">
-        select t.score
-        ,t.username_ as username
-        ,t.avatar_ as userAvatar
+        select t2.score
+        ,t2.username_ as username
+        ,t2.avatar_ as userAvatar
         ,s.name_ as userSubject
-        ,t.evaluationId
-        ,t.userId
+        ,t2.evaluationId
+        ,t2.userId
         from
-        (select
+        (select aem2.evaluation_id_ as evaluationId
+            ,su.id_ as userId
+            ,su.username_
+            ,su.avatar_
+            ,t.score
+        from (select
             max(aem.score_) as score,
-            aem.evaluation_id_,
-            aem.user_id_,
-        su.username_,
-        su.avatar_,
-        su.id_ as userId,
-        aem.evaluation_id_ as evaluationId
+            aem.evaluation_id_
+            from  activity_evaluation_record aem
+            where
+                aem.score_ is not null   and aem.activity_id_ = #{activityPlanId}
+            group by aem.evaluation_id_
+                       ) t
+            left join activity_evaluation_record aem2 on aem2.score_ = t.score and t.evaluation_id_ = aem2.evaluation_id_
+            left join sys_user su on su.id_ = aem2.user_id_
+            where aem2.activity_id_ = #{activityPlanId} and su.del_flag_ = 0 group by t.score,t.evaluation_id_
 
-        from  activity_evaluation_record aem
-        left join sys_user su on su.id_ = aem.user_id_
-        <where>
-            su.del_flag_ = 0 and aem.score_ is not null
-            <if test="activityPlanId != null">
-                and aem.activity_id_ = #{activityPlanId}
-            </if>
-        </where>
-        group by aem.evaluation_id_) t
-        left join student stu on stu.user_id_ = t.user_id_
+        ) t2
+        left join student stu on stu.user_id_ = t2.userId
         left join subject s on s.id_ = stu.subject_id_
 
     </select>

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

@@ -298,7 +298,11 @@
                 and #{param.auditVersion} = t.audit_version_
             </if>
         </where>
-        order by t.top_flag_ desc, t.sort_number_ desc, t2.num desc,  t.id_ desc
+        order by
+        <if test="param.myself == null or param.myself == false ">
+            t.top_flag_ desc, t.sort_number_ desc, t2.num desc,
+        </if>
+        t.id_ desc
     </select>
 
     <select id="selectMyMusicPage" resultType="com.yonge.cooleshow.biz.dal.vo.MusicSheetVo">

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

@@ -129,8 +129,7 @@ public class MusicSheetController extends BaseController {
             query.setCreateBy(sysUser.getId());
             if (query.getAuditStatus() != null && AuthStatusEnum.PASS.getCode().equals(query.getAuditStatus().getCode())) {
                 query.setState(YesOrNoEnum.YES);
-            }
-            if (query.getAuditStatus() != null && AuthStatusEnum.OUT_SALE.getCode().equals(query.getAuditStatus().getCode())) {
+            } else if (query.getAuditStatus() != null && AuthStatusEnum.OUT_SALE.getCode().equals(query.getAuditStatus().getCode())) {
                 query.setState(YesOrNoEnum.NO);
                 query.setAuditStatus(AuthStatusEnum.PASS);
             }
@@ -147,7 +146,7 @@ public class MusicSheetController extends BaseController {
             query.setMyself(false);
         }
 
-        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);
+        IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectStudentPage(PageUtil.getPage(query), query);
         return succeed(PageUtil.pageInfo(musicSheetVoIPage));
     }
 

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

@@ -108,6 +108,7 @@ public class MusicSheetController extends BaseController {
             query.setState(YesOrNoEnum.YES);
         }
         query.setSourceType(SourceTypeEnum.TEACHER);
+        query.setMyself(true);
 
         IPage<MusicSheetVo> musicSheetVoIPage = musicSheetService.selectPage(PageUtil.getPage(query), query);