From 185f5dc7c3c49f565da51cd9c2f7750f30990d4a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 11 十一月 2024 13:28:29 +0800
Subject: [PATCH] 代码提交
---
xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
index 6fd7df4..b3f2b0d 100644
--- a/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
+++ b/xinquan-modules/xinquan-course/src/main/java/com/xinquan/course/controller/client/ClientCourseController.java
@@ -660,6 +660,17 @@
}else if (data!=null){
// 查询学习人数和头像列表
clientCourseVO.setCount(data.size());
+ List<CourseChapter> list = courseChapterService.lambdaQuery().eq(CourseChapter::getCourseId, byId.getId())
+ .list();
+ // 累加实际学习人数
+ int a = 0;
+ int b = 0;
+ for (CourseChapter courseChapter : list) {
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ a+=data2;
+ b+=courseChapter.getVirtualLearnedNum();
+ }
+ clientCourseVO.setCount(a+b);
if (data.size()>=5){
clientCourseVO.setHeaders(data.stream().limit(5).map(AppUser::getAvatar).collect(Collectors.toList()));
}else{
@@ -671,6 +682,7 @@
clientCourseVO.setIsBuy(1);
}
}
+
}
// 查询是否已收藏课程
clientCourseVO.setIsCollect(courseUserFavoriteService.lambdaQuery()
@@ -686,15 +698,24 @@
.orderByDesc(CourseChapter::getSortNum)
.list();
for (CourseChapter courseChapter : page) {
- int size = courseLearningRecordService.lambdaQuery()
- .eq(CourseLearningRecord::getChapterId, courseChapter.getId())
- .list().size();
- courseChapter.setRealLearnedNum(size+courseChapter.getVirtualLearnedNum());
+ // 累加实际学习人数
+ int a = 0;
+ int b = 0;
+ Long data2 = remoteAppUserService.getCourseChapterHistoryCount(courseChapter.getId()).getData();
+ a+=data2;
+ b+=courseChapter.getVirtualLearnedNum();
+ courseChapter.setRealLearnedNum(a+b);
+ courseChapter.setVirtualLearnedNum(0);
+ LoginUser loginUser = tokenService.getLoginUser();
+ if (loginUser!=null){
+ Integer data1 = remoteAppUserService.getCourseChapterHistoryState(loginUser.getUserid(), courseChapter.getId()).getData();
+ courseChapter.setIsOver(data1);
+ }else{
+ courseChapter.setIsOver(2);
+ }
}
clientCourseVO.setList(page);
clientCourseVO.setIsBuy(2);
-
-
// 查询推荐课程
List<Course> list = courseService.lambdaQuery().eq(Course::getCateId, byId.getCateId())
.eq(Course::getCourseType,1)
--
Gitblit v1.7.1