Merge branch 'feature/1010_courseware' into develop-new

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

@@ -531,6 +531,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             return new ArrayList<>();
         }
 
+        List<LessonCoursewareDetailWrapper.RefLevelDetailInfo> result = new ArrayList<>();
         // 查询出机构下的所有可用教材
         List<TenantAlbumMusic> detail = tenantAlbumMusicService.lambdaQuery()
             .eq(TenantAlbumMusic::getTenantId, query.getTenantId())
@@ -543,7 +544,6 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
 
 
         // 根据机构，查询机构可以查看的所有课件，然后根据课件查询对应的课程类型
-        List<LessonCoursewareDetailWrapper.RefLevelDetailInfo> result = new ArrayList<>();
         List<CbsLessonCoursewareDetailWrapper.Entity> entities = coursewareFeignService.lessonCoursewareDetailLambdaQuery(CbsLessonCoursewareDetailWrapper.LambdaQuery.builder()
             .id(query.getLessonCoursewareDetailId())
             .build()).feignData();
@@ -551,9 +551,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             throw new BizException("课件不存在");
         }
         CbsLessonCoursewareDetailWrapper.Entity lessonCoursewareDetail = entities.get(0);
-        if (lessonCoursewareDetail.getLevel() == null) {
-            return new ArrayList<>();
-        }
+
         List<CbsLessonCoursewareWrapper.Entity> lessonCoursewareEntityList = coursewareFeignService.lessonCoursewareLambdaQuery(CbsLessonCoursewareWrapper.LambdaQuery.builder()
             .id(lessonCoursewareDetail.getLessonCoursewareId())
             .build()).feignData();
@@ -564,7 +562,7 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
 
         CbsLessonCoursewareWrapper.LessonCoursewareQuery cbsQuery = new CbsLessonCoursewareWrapper.LessonCoursewareQuery();
         cbsQuery.setEnableFlag(true);
-        cbsQuery.setOrchestraType(lessonCourseware.getOrchestraType());
+//        cbsQuery.setOrchestraType(lessonCourseware.getOrchestraType());
         cbsQuery.setLessonCoursewareIds(detail.stream().map(TenantAlbumMusic::getMusicSheetId).distinct().collect(Collectors.toList()));
         cbsQuery.setPage(1);
         cbsQuery.setRows(9999);
@@ -577,27 +575,39 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
         List<Long> lessonCoursewareIds = lessonCoursewareList.stream().map(CbsLessonCoursewareWrapper.LessonCourseware::getId).collect(Collectors.toList());
 
         // 查询可用的课件详情信息
-        List<CbsLessonCoursewareDetailWrapper.Entity> lessonCoursewareDetails = coursewareFeignService
-            .lessonCoursewareDetailLambdaQuery(CbsLessonCoursewareDetailWrapper.LambdaQuery.builder()
-                .level(lessonCoursewareDetail.getLevel())
-                .lessonCoursewareIds(lessonCoursewareIds)
-                .build()).feignData();
-        if (org.springframework.util.CollectionUtils.isEmpty(lessonCoursewareDetails)) {
-            return new ArrayList<>();
-        }
-        for (CbsLessonCoursewareDetailWrapper.Entity coursewareDetail : lessonCoursewareDetails) {
-            LessonCoursewareDetailWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareDetailWrapper.RefLevelDetailInfo();
-            refLevelDetailInfo.setId(coursewareDetail.getId().toString());
-            refLevelDetailInfo.setLessonCoursewareId(coursewareDetail.getLessonCoursewareId().toString());
-            CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware1 = lessonCoursewareMap.get(coursewareDetail.getLessonCoursewareId());
-            if (lessonCourseware1 == null) {
-                continue;
+        if (lessonCoursewareDetail.getLevel() != null) {
+            List<CbsLessonCoursewareDetailWrapper.Entity> lessonCoursewareDetails = coursewareFeignService
+                .lessonCoursewareDetailLambdaQuery(CbsLessonCoursewareDetailWrapper.LambdaQuery.builder()
+                    .level(lessonCoursewareDetail.getLevel())
+                    .lessonCoursewareIds(lessonCoursewareIds)
+                    .build()).feignData();
+            if (org.springframework.util.CollectionUtils.isEmpty(lessonCoursewareDetails)) {
+                return new ArrayList<>();
+            }
+            for (CbsLessonCoursewareDetailWrapper.Entity coursewareDetail : lessonCoursewareDetails) {
+                LessonCoursewareDetailWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareDetailWrapper.RefLevelDetailInfo();
+                refLevelDetailInfo.setId(coursewareDetail.getId().toString());
+                refLevelDetailInfo.setLessonCoursewareId(coursewareDetail.getLessonCoursewareId().toString());
+                CbsLessonCoursewareWrapper.LessonCourseware lessonCourseware1 = lessonCoursewareMap.get(coursewareDetail.getLessonCoursewareId());
+                if (lessonCourseware1 == null) {
+                    continue;
+                }
+                refLevelDetailInfo.setCoverImg(lessonCourseware1.getCoverImg());
+                refLevelDetailInfo.setCourseTypeCode(lessonCourseware1.getCourseTypeCode());
+                refLevelDetailInfo.setLockFlag(false);
+                refLevelDetailInfo.setLessonCoursewareName(lessonCourseware1.getName());
+                refLevelDetailInfo.setUseFlag(coursewareDetail.getId().equals(query.getLessonCoursewareDetailId()));
+                result.add(refLevelDetailInfo);
             }
-            refLevelDetailInfo.setCoverImg(lessonCourseware1.getCoverImg());
-            refLevelDetailInfo.setCourseTypeCode(lessonCourseware1.getCourseTypeCode());
+        } else {
+            LessonCoursewareDetailWrapper.RefLevelDetailInfo refLevelDetailInfo = new LessonCoursewareDetailWrapper.RefLevelDetailInfo();
+            refLevelDetailInfo.setId(lessonCoursewareDetail.getId().toString());
+            refLevelDetailInfo.setLessonCoursewareId(lessonCoursewareDetail.getLessonCoursewareId().toString());
+            refLevelDetailInfo.setCoverImg(lessonCourseware.getCoverImg());
+            refLevelDetailInfo.setCourseTypeCode(lessonCourseware.getCourseTypeCode());
             refLevelDetailInfo.setLockFlag(false);
-            refLevelDetailInfo.setLessonCoursewareName(lessonCourseware1.getName());
-            refLevelDetailInfo.setUseFlag(coursewareDetail.getId().equals(query.getLessonCoursewareDetailId()));
+            refLevelDetailInfo.setLessonCoursewareName(lessonCourseware.getName());
+            refLevelDetailInfo.setUseFlag(true);
             result.add(refLevelDetailInfo);
         }
         return result;