|
|
@@ -6,9 +6,12 @@ import com.dayaedu.cbs.openfeign.client.CoursewareFeignService;
|
|
|
import com.dayaedu.cbs.openfeign.wrapper.courseware.CbsLessonCoursewareDetailWrapper;
|
|
|
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.entity.Subject;
|
|
|
import com.ym.mec.biz.dal.wrapper.LessonCoursewareWrapper;
|
|
|
+import com.ym.mec.biz.service.CbsMusicScoreCategoriesService;
|
|
|
import com.ym.mec.biz.service.LessonCoursewareService;
|
|
|
+import com.ym.mec.biz.service.OrganizationService;
|
|
|
import com.ym.mec.biz.service.SysUserService;
|
|
|
import com.ym.mec.common.controller.BaseController;
|
|
|
import com.ym.mec.common.entity.HttpResponseResult;
|
|
|
@@ -34,6 +37,10 @@ public class LessonCoursewareController extends BaseController {
|
|
|
private LessonCoursewareService lessonCoursewareService;
|
|
|
@Resource
|
|
|
private SysUserService sysUserService;
|
|
|
+ @Resource
|
|
|
+ private OrganizationService organizationService;
|
|
|
+ @Resource
|
|
|
+ private CbsMusicScoreCategoriesService cbsMusicScoreCategoriesService;
|
|
|
|
|
|
@ApiOperation(value = "分页查询已添加的课件")
|
|
|
@PostMapping("/queryLessonCourseware")
|
|
|
@@ -65,7 +72,10 @@ public class LessonCoursewareController extends BaseController {
|
|
|
@ApiOperation(value = "获取课程详情")
|
|
|
@GetMapping("/getLessonCourseDetail/{id}")
|
|
|
public HttpResponseResult<CbsLessonCoursewareDetailWrapper.LessonCoursewareDetail> getLessonCourseDetail(@PathVariable("id") Long id){
|
|
|
- return succeed(lessonCoursewareService.getLessonCourseDetail(id));
|
|
|
+ SysUser sysUser = sysUserService.getUser();
|
|
|
+ String teachingMaterialIds = organizationService.getTeachingMaterialIds(sysUser.getOrganId().toString(),sysUser.getTenantId());
|
|
|
+ List<Integer> categoryIdList = cbsMusicScoreCategoriesService.getAllCategoryIdList(teachingMaterialIds);
|
|
|
+ return succeed(lessonCoursewareService.getLessonCourseDetail(id,categoryIdList));
|
|
|
}
|
|
|
|
|
|
@ApiOperation(value = "获取课件关联的声部列表")
|
