枚举处理

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

@@ -4,6 +4,7 @@ import cn.hutool.core.util.NumberUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.dayaedu.cbs.common.enums.EClientType;
 import com.dayaedu.cbs.common.enums.school.ECourseType;
 import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
 import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsCourseTypeWrapper;
@@ -173,8 +174,8 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
                 List<ECourseType> courseTypeList = courseTypeBySubject(query.getSubjectId());
 
                 PageInfo<CbsLessonCoursewareWrapper.LessonCourseware> lessonCoursewarePageInfo = coursewareFeignService.lessonCoursewarePage(CbsLessonCoursewareWrapper.LessonCoursewareQuery.builder()
-                    .page(query.getPage()).rows(query.getRows()).lessonCoursewareIds(coursewareIds).courseTypes(courseTypeList).enableFlag(true)
-                    .courseTypeCode(query.getCourseTypeCode()).build()
+                    .page(query.getPage()).rows(query.getRows()).lessonCoursewareIds(coursewareIds).courseTypes(courseTypeList).keyword(query.getKeyword()).enableFlag(true)
+                    .courseTypeCode(ECourseType.valueOf(query.getCourseTypeCode())).build()
                 ).feignData();
 
                 for (CbsLessonCoursewareWrapper.LessonCourseware row : lessonCoursewarePageInfo.getRows()) {
@@ -252,10 +253,9 @@ public class TenantAlbumMusicServiceImpl extends ServiceImpl<TenantAlbumMusicMap
             List<CbsLessonCoursewareWrapper.Entity> entities = coursewareFeignService.lessonCoursewareLambdaQuery(lambdaQuery).feignData();
 
             List<ECourseType> courseTypeList = courseTypeBySubject(query.getSubjectId());
-            List<ECourseType> courseTypes = entities.stream()
+            List<String> courseTypes = entities.stream()
                 .map(CbsLessonCoursewareWrapper.Entity::getCourseTypeCode)
                 .filter(courseTypeCode -> courseTypeList.contains(ECourseType.valueOf(courseTypeCode)))
-                .map(ECourseType::valueOf)
                 .distinct().collect(Collectors.toList());
             data.setCourseTypeList(courseTypes);
         }

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

@@ -123,7 +123,7 @@ public class TenantAlbumMusicWrapper {
         private List<MusicTag> tags = new ArrayList<>();
 
         @ApiModelProperty("课件教材分类集合")
-        private List<ECourseType> courseTypeList = new ArrayList<>();
+        private List<String> courseTypeList = new ArrayList<>();
 
         public String jsonString() {
             return JSON.toJSONString(this);
@@ -177,7 +177,7 @@ public class TenantAlbumMusicWrapper {
         private Long userId;
 
         @ApiModelProperty("课程类型编码")
-        private ECourseType courseTypeCode;
+        private String courseTypeCode;
 
         public String getKeyword() {
             return Optional.ofNullable(keyword).filter(StringUtils::isNotBlank).orElse(null);