fix

zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectBankController.java

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

zhongzheng-api/src/main/java/com/zhongzheng/controller/collect/CollectNoteController.java

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectBank.java

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/domain/CollectNote.java

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

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/mapper/CollectBankMapper.java

@@ -1,7 +1,11 @@
 package com.zhongzheng.modules.collect.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectBank;
+import com.zhongzheng.modules.collect.vo.CollectBankVo;
+
+import java.util.List;
 
 /**
  * 收藏题库Mapper接口
@@ -11,4 +15,6 @@ import com.zhongzheng.modules.collect.domain.CollectBank;
  */
 public interface CollectBankMapper extends BaseMapper<CollectBank> {
 
+    List<CollectBankVo> selectList(CollectBankQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/mapper/CollectNoteMapper.java

@@ -2,7 +2,11 @@ package com.zhongzheng.modules.collect.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.collect.bo.CollectNoteQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectNote;
+import com.zhongzheng.modules.collect.vo.CollectNoteVo;
+
+import java.util.List;
 
 /**
  * 收藏考试重点Mapper接口
@@ -12,4 +16,6 @@ import com.zhongzheng.modules.collect.domain.CollectNote;
  */
 public interface CollectNoteMapper extends BaseMapper<CollectNote> {
 
+    List<CollectNoteVo> selectList(CollectNoteQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectBankService.java

@@ -4,9 +4,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.collect.bo.CollectBankAddBo;
 import com.zhongzheng.modules.collect.bo.CollectBankEditBo;
 import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
+import com.zhongzheng.modules.collect.bo.CollectCourseQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectBank;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
 import com.zhongzheng.modules.collect.vo.CollectBankVo;
+import com.zhongzheng.modules.collect.vo.CollectCourseVo;
 
 import java.util.Collection;
 import java.util.List;
@@ -31,6 +33,8 @@ public interface ICollectBankService extends IService<CollectBank> {
 	 */
 	List<CollectBankVo> queryList(CollectBankQueryBo bo);
 
+	List<CollectBankVo> selectList(CollectBankQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入收藏题库
 	 * @param bo 收藏题库新增业务对象

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/ICollectNoteService.java

@@ -25,6 +25,10 @@ public interface ICollectNoteService extends IService<CollectNote> {
 	 */
 	CollectNoteVo queryById(Long collectNoteId);
 
+	List<CollectNoteVo> selectList(CollectNoteQueryBo bo);
+
+
+
 	CollectNote queryByNoteId(Long userID, Long courseId);
 
 	/**

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectBankServiceImpl.java

@@ -11,8 +11,10 @@ import com.zhongzheng.modules.collect.bo.CollectBankQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectBank;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
 import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
+import com.zhongzheng.modules.collect.mapper.CollectCourseMapper;
 import com.zhongzheng.modules.collect.service.ICollectBankService;
 import com.zhongzheng.modules.collect.vo.CollectBankVo;
+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;
@@ -34,6 +36,10 @@ import java.util.stream.Collectors;
 @Service
 public class CollectBankServiceImpl extends ServiceImpl<CollectBankMapper, CollectBank> implements ICollectBankService {
 
+
+    @Autowired
+    private CollectBankMapper collectBankMapper;
+
     @Override
     public CollectBankVo queryById(Long collectBankId){
         CollectBank db = this.baseMapper.selectById(collectBankId);
@@ -57,6 +63,11 @@ public class CollectBankServiceImpl extends ServiceImpl<CollectBankMapper, Colle
         return entity2Vo(this.list(lqw));
     }
 
+    @Override
+    public List<CollectBankVo> selectList(CollectBankQueryBo bo) {
+        return collectBankMapper.selectList(bo);
+    }
+
     /**
     * 实体类转化成视图对象
     *

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/service/impl/CollectNoteServiceImpl.java

@@ -10,9 +10,11 @@ import com.zhongzheng.modules.collect.bo.CollectNoteEditBo;
 import com.zhongzheng.modules.collect.bo.CollectNoteQueryBo;
 import com.zhongzheng.modules.collect.domain.CollectCourse;
 import com.zhongzheng.modules.collect.domain.CollectNote;
+import com.zhongzheng.modules.collect.mapper.CollectBankMapper;
 import com.zhongzheng.modules.collect.mapper.CollectNoteMapper;
 import com.zhongzheng.modules.collect.service.ICollectNoteService;
 import com.zhongzheng.modules.collect.vo.CollectNoteVo;
+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,12 +35,20 @@ import java.util.stream.Collectors;
 @Service
 public class CollectNoteServiceImpl extends ServiceImpl<CollectNoteMapper, CollectNote> implements ICollectNoteService {
 
+    @Autowired
+    private CollectNoteMapper collectNoteMapper;
+
     @Override
     public CollectNoteVo queryById(Long collectNoteId){
         CollectNote db = this.baseMapper.selectById(collectNoteId);
         return BeanUtil.toBean(db, CollectNoteVo.class);
     }
 
+    @Override
+    public List<CollectNoteVo> selectList(CollectNoteQueryBo bo) {
+        return collectNoteMapper.selectList(bo);
+    }
+
     @Override
     public CollectNote queryByNoteId(Long userID, Long courseId) {
         CollectNote info = getOne(new LambdaQueryWrapper<CollectNote>()

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/vo/CollectBankVo.java

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.collect.vo;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.zhongzheng.common.annotation.Excel;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.annotations.ApiModel;
@@ -32,5 +33,9 @@ public class CollectBankVo {
 	@Excel(name = "用户ID")
 	@ApiModelProperty("用户ID")
 	private Long userId;
+	@ApiModelProperty("题库")
+	private String bankName;
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/collect/vo/CollectNoteVo.java

@@ -32,5 +32,9 @@ public class CollectNoteVo {
 	@Excel(name = "用户ID")
 	@ApiModelProperty("用户ID")
 	private Long userId;
+	@ApiModelProperty("重点考点")
+	private String name;
+	@ApiModelProperty("封面地址")
+	private String coverUrl;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/collect/CollectBankMapper.xml

@@ -9,7 +9,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="bankId" column="bank_id"/>
         <result property="userId" column="user_id"/>
         <result property="createTime" column="create_time"/>
+        <result property="bankName" column="bank_name"/>
+        <result property="coverUrl" column="cover_url"/>
     </resultMap>
 
+    <select id="selectList" parameterType="com.zhongzheng.modules.collect.domain.CollectBank"  resultMap="CollectBankResult">
+        SELECT
+        cb.*,
+        qb.bank_name,
+        qb.cover_url
+        FROM
+        collect_bank cb
+        LEFT JOIN question_bank qb ON cb.bank_id = qb.bank_id
+        WHERE
+        STATUS = 1
+        <if test="userId != null and userId != ''">
+            AND user_id = #{userId}
+        </if>
 
+    </select>
 </mapper>