From fef8e1050da603344ed8bda819d390c2c16551ea Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期六, 09 十一月 2024 17:32:05 +0800 Subject: [PATCH] 代码提交 --- xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientTutorSpecialColumnController.java | 26 ++++++++++++++++++++++---- 1 files changed, 22 insertions(+), 4 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 460bac1..fb581e4 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 @@ -10,15 +10,16 @@ import com.xinquan.common.security.utils.SecurityUtils; import com.xinquan.course.api.domain.Course; import com.xinquan.course.api.domain.CourseCategory; +import com.xinquan.course.api.domain.CourseChapter; +import com.xinquan.course.domain.CourseLearningRecord; import com.xinquan.course.domain.TutorSpecialColumn; import com.xinquan.course.domain.TutorSpecialColumnCourse; import com.xinquan.course.domain.vo.ClientCourseVO; import com.xinquan.course.domain.vo.TutorCourseVO; import com.xinquan.course.domain.vo.TutorVo; -import com.xinquan.course.service.CourseCategoryService; -import com.xinquan.course.service.CourseService; -import com.xinquan.course.service.TutorSpecialColumnCourseService; -import com.xinquan.course.service.TutorSpecialColumnService; +import com.xinquan.course.service.*; +import com.xinquan.system.api.domain.AppUser; +import com.xinquan.user.api.feign.RemoteAppUserService; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; @@ -53,6 +54,12 @@ private CourseCategoryService courseCategoryService; @Resource private CourseService courseService; + @Resource + private CourseLearningRecordService courseLearningRecordService; + @Resource + private CourseChapterService courseChapterService; + @Resource + private RemoteAppUserService remoteAppUserService; @PostMapping("/getCoursePageList") @ApiOperation(value = "导师专栏",tags = "导师专栏") public R<TutorVo> getCourseList() { @@ -71,6 +78,17 @@ List<Course> page = courseService.list(courseLambdaQueryWrapper); for (Course course : page) { TutorCourseVO tutorCourseVO = new TutorCourseVO(); + List<AppUser> data = remoteAppUserService.getUserByCourseId(course.getId()).getData(); + List<CourseChapter> list1 = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, course.getId()).list(); + int a = 0; + int b = 0; + for (CourseChapter courseChapter : list1) { + a+= courseChapter.getVirtualLearnedNum(); + Long data1 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData(); + b+=data1; + } + course.setCount(a+b); + course.setRealLearnedNum(a+b); BeanUtils.copyProperties(course, tutorCourseVO); clientCourseVOS.add(tutorCourseVO); } -- Gitblit v1.7.1