|
@@ -8,8 +8,9 @@ import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareWrapper;
|
|
|
import com.microsvc.toolkit.common.response.paging.QueryInfo;
|
|
|
import com.ym.mec.auth.api.entity.SysUser;
|
|
|
import com.ym.mec.biz.dal.dao.CloudTeacherOrderDao;
|
|
|
-import com.ym.mec.biz.dal.entity.*;
|
|
|
-import com.ym.mec.biz.dal.enums.ClientEnum;
|
|
|
+import com.ym.mec.biz.dal.entity.LessonCourseware;
|
|
|
+import com.ym.mec.biz.dal.entity.MemberRankCategoryMapper;
|
|
|
+import com.ym.mec.biz.dal.entity.MemberRankCourseTypeMapper;
|
|
|
import com.ym.mec.biz.dal.entity.Subject;
|
|
|
import com.ym.mec.biz.dal.enums.ClientEnum;
|
|
|
import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
|
|
@@ -22,7 +23,6 @@ import com.ym.mec.common.page.PageUtil;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
import org.jetbrains.annotations.NotNull;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
@@ -129,8 +129,11 @@ public class LessonCoursewareController extends BaseController {
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "获取课件关联的课程列表")
|
|
|
- @PostMapping("/getLessonCoursewareCourseList")
|
|
|
- public HttpResponseResult<List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail>> getLessonCoursewareCourseList(@RequestBody CbsLessonCoursewareWrapper.CoursewareDetailQuery query){
|
|
|
+ @GetMapping("/getLessonCoursewareCourseList/{id}")
|
|
|
+ public HttpResponseResult<List<LessonCoursewareWrapper.CourseScheduleCoursewareDetail>> getLessonCoursewareCourseList(@PathVariable("id") Long id,String search){
|
|
|
+ CbsLessonCoursewareWrapper.CoursewareDetailQuery query = new CbsLessonCoursewareWrapper.CoursewareDetailQuery();
|
|
|
+ query.setId(id);
|
|
|
+ query.setSearch(search);
|
|
|
List<CbsLessonCoursewareWrapper.CourseScheduleCoursewareDetail> courseScheduleCoursewareDetails = coursewareFeignService.coursewareDetail(query).feignData();
|
|
|
if (CollectionUtils.isNotEmpty(courseScheduleCoursewareDetails)) {
|
|
|
String jsonString = JSONObject.toJSONString(courseScheduleCoursewareDetails);
|