he2802 4 年 前
コミット
f6dee1ffc4

+ 1 - 1
zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectCourseController.java

@@ -57,7 +57,7 @@ public class CollectCourseController extends BaseController {
         ClientLoginUser loginUser = wxTokenService.getLoginUser(ServletUtils.getRequest());
         bo.setUserId(loginUser.getUser().getUserId());
         startPage();
-        List<CollectCourseVo> list = iCollectCourseService.queryList(bo);
+        List<CollectCourseVo> list = iCollectCourseService.selectList(bo);
         return getDataTable(list);
     }
 

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectCourse.java

@@ -37,5 +37,9 @@ private static final long serialVersionUID=1L;
     /** 添加时间 */
     @TableField(fill = FieldFill.INSERT)
     private Long createTime;
+    @TableField(exist = false)
+    private String courseName;
+    @TableField(exist = false)
+    private String coverUrl;
 
 }

+ 6 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/mapper/CollectCourseMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.collect.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.collect.bo.CollectCourseQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
+import com.zhongzheng.modules.collect.vo.CollectCourseVo;
+
+import java.util.List;
 
 /**
  * 收藏课程Mapper接口
@@ -11,4 +15,6 @@ import com.zhongzheng.modules.collect.domain.CollectCourse;
  */
 public interface CollectCourseMapper extends BaseMapper<CollectCourse> {
 
+    List<CollectCourseVo> selectList(CollectCourseQueryBo bo);
+
 }

+ 3 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectCourseService.java

@@ -23,6 +23,7 @@ public interface ICollectCourseService extends IService<CollectCourse> {
 	 */
 	CollectCourseVo queryById(Long collectCourseId);
 
+
 	CollectCourse queryByCourseId(Long userID,Long courseId);
 
 	/**
@@ -30,6 +31,8 @@ public interface ICollectCourseService extends IService<CollectCourse> {
 	 */
 	List<CollectCourseVo> queryList(CollectCourseQueryBo bo);
 
+	List<CollectCourseVo> selectList(CollectCourseQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入收藏课程
 	 * @param bo 收藏课程新增业务对象

+ 10 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectCourseServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.lang.Validator;
 import cn.hutool.core.util.StrUtil;
 import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
+import com.zhongzheng.modules.bank.mapper.QuestionBankMapper;
 import com.zhongzheng.modules.collect.bo.CollectCourseAddBo;
 import com.zhongzheng.modules.collect.bo.CollectCourseEditBo;
 import com.zhongzheng.modules.collect.bo.CollectCourseQueryBo;
@@ -13,6 +14,7 @@ import com.zhongzheng.modules.collect.mapper.CollectCourseMapper;
 import com.zhongzheng.modules.collect.service.ICollectCourseService;
 import com.zhongzheng.modules.collect.vo.CollectCourseVo;
 import com.zhongzheng.modules.course.domain.MajorCategory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -33,6 +35,9 @@ import java.util.stream.Collectors;
 @Service
 public class CollectCourseServiceImpl extends ServiceImpl<CollectCourseMapper, CollectCourse> implements ICollectCourseService {
 
+    @Autowired
+    private CollectCourseMapper collectCourseMapper;
+
     @Override
     public CollectCourseVo queryById(Long collectCourseId){
         CollectCourse db = this.baseMapper.selectById(collectCourseId);
@@ -56,6 +61,11 @@ public class CollectCourseServiceImpl extends ServiceImpl<CollectCourseMapper, C
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<CollectCourseVo> selectList(CollectCourseQueryBo bo) {
+        return collectCourseMapper.selectList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

+ 8 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/vo/CollectCourseVo.java

@@ -32,5 +32,13 @@ public class CollectCourseVo {
 	@Excel(name = "用户ID")
 	@ApiModelProperty("用户ID")
 	private Long userId;
+	/** 课程名称 */
+	@Excel(name = "课程名称")
+	@ApiModelProperty("课程名称")
+	private String courseName;
+	/** 封面地址 */
+	@Excel(name = "封面地址")
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
 
 }

+ 16 - 0
zhongzheng-system/src/main/resources/mapper/modules/collect/CollectCourseMapper.xml

@@ -9,7 +9,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId" column="course_id"/>
         <result property="userId" column="user_id"/>
         <result property="createTime" column="create_time"/>
+        <result property="courseName" column="course_name"/>
+        <result property="coverUrl" column="cover_url"/>
     </resultMap>
 
+    <select id="selectList" parameterType="com.zhongzheng.modules.collect.domain.CollectCourse"  resultMap="CollectCourseResult">
+        SELECT
+        cc.*,
+        c.course_name,
+        c.cover_url
+        FROM
+        collect_course cc
+        LEFT JOIN course c ON cc.course_id = c.course_id
+        WHERE
+        STATUS = 1
+        <if test="userId != null and userId != ''">
+            AND user_id = #{userId}
+        </if>
 
+    </select>
 </mapper>