diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDao.java index 47fbc205..549e2c01 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDao.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sqx.modules.course.entity.Course; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; +import java.util.Set; @Mapper public interface CourseDao extends BaseMapper { @@ -37,5 +39,4 @@ public interface CourseDao extends BaseMapper { * @return */ List> selectCourseTitle(@Param("title")String title); - } diff --git a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java index 087781a2..d291c206 100644 --- a/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java +++ b/src/main/java/com/sqx/modules/course/dao/CourseDetailsDao.java @@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.sqx.modules.course.entity.CourseDetails; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; import java.util.List; import java.util.Map; +import java.util.Set; @Mapper public interface CourseDetailsDao extends BaseMapper { @@ -22,4 +24,5 @@ public interface CourseDetailsDao extends BaseMapper { Map countCourse(Long courseId); + List countByCourseId(@Param("detailIdList") Set detailIdList); } diff --git a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java index 026b8696..d90683d8 100644 --- a/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java +++ b/src/main/java/com/sqx/modules/course/service/impl/CourseCollectServiceImpl.java @@ -12,6 +12,7 @@ import com.sqx.common.utils.Result; import com.sqx.modules.course.dao.CourseClassificationDao; import com.sqx.modules.course.dao.CourseCollectDao; import com.sqx.modules.course.dao.CourseDao; +import com.sqx.modules.course.dao.CourseDetailsDao; import com.sqx.modules.course.entity.Course; import com.sqx.modules.course.entity.CourseCollect; import com.sqx.modules.course.entity.CourseDetails; @@ -37,6 +38,8 @@ public class CourseCollectServiceImpl extends ServiceImpl courseDetailsMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsService.list(new LambdaQueryWrapper() .in(CourseDetails::getCourseDetailsId, detailIdList)).stream() .collect(Collectors.toMap(CourseDetails::getCourseDetailsId, item->item)); + + Map countMap = detailIdList.isEmpty() ? new HashMap<>() : courseDetailsDao.countByCourseId(detailIdList).stream().collect(Collectors.toMap(CourseDetails::getCourseId, CourseDetails::getCourseDetailsCount)); + PageInfo pageInfo = new PageInfo<>(courseList); if (CollectionUtil.isNotEmpty(courseList)) { List courses = pageInfo.getList(); @@ -142,7 +148,7 @@ public class CourseCollectServiceImpl extends ServiceImpl +