筛选

cooleshow-app/src/main/java/com/yonge/cooleshow/student/controller/TenantAlbumSheetController.java

@@ -1,5 +1,6 @@
 package com.yonge.cooleshow.student.controller;
 
+import com.alibaba.cloud.commons.lang.StringUtils;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.microsvc.toolkit.common.response.paging.QueryInfo;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
@@ -55,10 +56,15 @@ public class TenantAlbumSheetController extends BaseController {
             return failed(HttpStatus.FORBIDDEN, "请登录");
         }
         query.setUserId(user.getId());
-        /*if(StringUtils.isBlank(query.getSubjectId())){
+        if(query.getSubjectId() == null){
         	Student student = studentService.getById(user.getId());
-        	query.setSubjectId(student.getSubjectId());
-        }*/
+            if (student == null) {
+                throw new BizException("学生信息不存在");
+            }
+            if (!StringUtil.isEmpty(student.getSubjectId())) {
+                query.setSubjectId(Long.parseLong(student.getSubjectId()));
+            }
+        }
         return succeed(tenantAlbumMusicService.getTenantAlbumMusicQuery(query));
     }
 

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/mapper/TenantAlbumMusicMapper.java

@@ -37,4 +37,6 @@ public interface TenantAlbumMusicMapper extends BaseMapper<TenantAlbumMusic> {
      * 获取专辑可使用的曲目
      */
     List<TenantAlbumMusic> getByAlbumAndEnable(@Param("tenantAlbumIds") List<Long> tenantAlbumIds);
+
+    List<TenantAlbumMusic> getList(@Param("param") TenantAlbumMusicWrapper.TenantAlbumMusicSelect query, @Param("albumIds") List<Long> albumIds);
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumMusicServiceImpl.java

@@ -196,12 +196,13 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         }
 
         // 专辑曲目关联数据
-        List<TenantAlbumMusic> list = this.lambdaQuery()
-                .in(TenantAlbumMusic::getTenantAlbumId, albumIds)
-                .eq(query.getTenantAlbumId() != null, TenantAlbumMusic::getTenantAlbumId, query.getTenantAlbumId())
-                .eq(query.getSubjectType() != null, TenantAlbumMusic::getSubjectType, query.getSubjectType())
-                .eq(TenantAlbumMusic::getDelFlag, false)
-                .list();
+//        List<TenantAlbumMusic> list = this.lambdaQuery()
+//                .in(TenantAlbumMusic::getTenantAlbumId, albumIds)
+//                .eq(query.getTenantAlbumId() != null, TenantAlbumMusic::getTenantAlbumId, query.getTenantAlbumId())
+//                .eq(query.getSubjectType() != null, TenantAlbumMusic::getSubjectType, query.getSubjectType())
+//                .eq(TenantAlbumMusic::getDelFlag, false)
+//                .list();
+        List<TenantAlbumMusic> list = tenantAlbumMusicMapper.getList(query,albumIds);
         if (CollectionUtils.isEmpty(list)) {
             return data;
         }

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

@@ -87,6 +87,8 @@ public class TenantAlbumMusicWrapper {
         @ApiModelProperty(value = "用户ID", hidden = true)
         private Long userId;
 
+        @ApiModelProperty("声部id")
+        private Long subjectId;
         public String jsonString() {
             return JSON.toJSONString(this);
         }

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

@@ -101,4 +101,28 @@
             #{item}
         </foreach>
     </select>
+
+    <select id="getList" resultType="com.yonge.cooleshow.biz.dal.entity.TenantAlbumMusic">
+        select
+        t.*
+        from tenant_album_music t
+        left join music_sheet m on t.music_sheet_id_ = m.id_
+        where
+        t.del_flag_ = 0
+        <if test="param.tenantAlbumId != null">
+            and t.tenant_album_id_ = #{param.tenantAlbumId}
+        </if>
+        <if test="param.subjectType != null">
+            and t.subject_type_ = #{param.subjectType}
+        </if>
+        <if test="albumIds != null and albumIds.size() != 0">
+            and t.tenant_album_id_ in
+            <foreach collection="albumIds" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="param.subjectId != null">
+            and (find_in_set(#{param.subjectId},m.music_subject_) or m.music_subject_ is null or m.music_subject_ = '' or m.music_sheet_type_ = 'CONCERT')
+        </if>
+    </select>
 </mapper>