From 64f7ccb9ef8b5a0618e65cddc14b981c1f108ba3 Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 04 十一月 2024 09:01:59 +0800 Subject: [PATCH] 代码提交 --- xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java | 36 +++++++++++++++++------------------- 1 files changed, 17 insertions(+), 19 deletions(-) diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java index 7641f59..ad6f279 100644 --- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java +++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java @@ -77,21 +77,28 @@ } } @GetMapping("/detailTutor") - @ApiOperation(value = "查看详情导师专栏", notes = "管理后台-导师专栏") + @ApiOperation(value = "查看详情导师专栏", tags = "管理后台-导师专栏") public R<TutorSpecialColumn> detailTutor() { TutorSpecialColumn one = tutorSpecialColumnService.getOne(null); if (one!=null){ - List<Long> collect = tutorSpecialColumnCourseService.lambdaQuery().eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, one.getId()) - .list().stream().map(TutorSpecialColumnCourse::getId).collect(Collectors.toList()); - if (!collect.isEmpty()){ + TutorSpecialColumnCourse one1 = tutorSpecialColumnCourseService.lambdaQuery() + .eq(TutorSpecialColumnCourse::getTutorSpecialColumnId, one.getId()).one(); + if (one1!=null){ + List<String> collect = Arrays.asList(one1.getCourseId().split(",")); List<Course> list = courseService.lambdaQuery().in(Course::getId, collect).list(); + for (Course course : list) { + CourseCategory byId = courseCategoryService.getById(course.getCateId()); + if (byId!=null){ + course.setCategoryName(byId.getName()); + } + } one.setCourses(list); } } return R.ok(one); } @PostMapping("/updateTutor") - @ApiOperation(value = "修改分类导师专栏", notes = "管理后台-导师专栏") + @ApiOperation(value = "修改分类导师专栏", tags = "管理后台-导师专栏") public R updateTutor(@RequestBody TutorSpecialColumn homeBackgroundMusic) { TutorSpecialColumn one = tutorSpecialColumnService.getOne(null); if (one == null){ @@ -105,20 +112,11 @@ .collect(Collectors.toList()); tutorSpecialColumnCourseService.removeBatchByIds(collect); List<TutorSpecialColumnCourse> tutorSpecialColumnCourses = new ArrayList<>(); - if (StringUtils.hasLength(homeBackgroundMusic.getCourseIds())){ - String[] split = homeBackgroundMusic.getCourseIds().split(","); - for (int i = 0; i < split.length; i++) { - TutorSpecialColumnCourse tutorSpecialColumnCourse = new TutorSpecialColumnCourse(); - tutorSpecialColumnCourse.setCourseId(split[i]); - tutorSpecialColumnCourse.setTutorSpecialColumnId(homeBackgroundMusic.getId()); - tutorSpecialColumnCourse.setCreateBy(SecurityUtils.getUsername()); - tutorSpecialColumnCourse.setCreateTime(LocalDateTime.now()); - tutorSpecialColumnCourse.setUpdateBy(SecurityUtils.getUsername()); - tutorSpecialColumnCourse.setUpdateTime(LocalDateTime.now()); - tutorSpecialColumnCourses.add(tutorSpecialColumnCourse); - } - tutorSpecialColumnCourseService.saveBatch(tutorSpecialColumnCourses); - } + TutorSpecialColumnCourse tutorSpecialColumnCourse = new TutorSpecialColumnCourse(); + tutorSpecialColumnCourse.setCourseId(homeBackgroundMusic.getCourseIds()); + tutorSpecialColumnCourse.setTutorSpecialColumnId(homeBackgroundMusic.getId()); + tutorSpecialColumnCourses.add(tutorSpecialColumnCourse); + tutorSpecialColumnCourseService.saveBatch(tutorSpecialColumnCourses); return R.ok(tutorSpecialColumnService.updateById(homeBackgroundMusic)); } -- Gitblit v1.7.1