fix 讲义列表

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/bo/CourseHandoutsQueryBo.java

@@ -37,7 +37,9 @@ public class CourseHandoutsQueryBo extends BaseEntity {
 	/** 排序的方向desc或者asc */
 	@ApiModelProperty(value = "排序的方向", example = "asc,desc")
 	private String isAsc;
-
+	/** 讲义id */
+	@ApiModelProperty("讲义id")
+	private Long handoutsId;
 
 	/** id */
 	@ApiModelProperty("id")

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/mapper/CourseHandoutsMapper.java

@@ -5,6 +5,7 @@ import com.zhongzheng.modules.course.bo.CourseHandoutsQueryBo;
 import com.zhongzheng.modules.course.domain.CourseHandouts;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.zhongzheng.modules.course.vo.CourseHandoutsBusinessVo;
+import com.zhongzheng.modules.course.vo.CourseHandoutsVo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Collection;
@@ -22,7 +23,7 @@ public interface CourseHandoutsMapper extends BaseMapper<CourseHandouts> {
 
     Collection<CourseHandouts> queryList(CourseHandoutsQueryBo bo);
 
-    Collection<CourseHandouts> queryByGoodsList(CourseHandoutsQueryBo bo);
+    List<CourseHandoutsVo> queryByGoodsList(CourseHandoutsQueryBo bo);
 
     @InterceptorIgnore(tenantLine = "true")
     CourseHandouts getHandoutsByTenant(@Param("encoder") String encoder,@Param("newTenantId") Long newTenantId);

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsServiceImpl.java

@@ -73,7 +73,7 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
     @Override
     public List<CourseHandoutsVo> queryByGoodsList(CourseHandoutsQueryBo bo) {
         bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
-        return entity2Vo(baseMapper.queryByGoodsList(bo));
+        return baseMapper.queryByGoodsList(bo);
     }
 
     /**

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseHandoutsVo.java

@@ -32,9 +32,9 @@ public class CourseHandoutsVo {
 	@Excel(name = "0 未启用 1启用 ")
 	@ApiModelProperty("0 未启用 1启用 ")
 	private Integer status;
-	/** 文件地址 */
-	@Excel(name = "文件地址")
-	@ApiModelProperty("文件地址")
+	/** 地址 */
+	@Excel(name = "地址")
+	@ApiModelProperty("地址")
 	private String handoutsUrl;
 	/** 编码YW */
 	@Excel(name = "编码YW")
@@ -54,4 +54,9 @@ public class CourseHandoutsVo {
 	@Excel(name = "0不可下载 1下载")
 	@ApiModelProperty("0不可下载 1下载")
 	private Integer canDownload;
+
+	/** 地址 */
+	@Excel(name = "地址")
+	@ApiModelProperty("地址")
+	private String url;
 }

zhongzheng-system/src/main/resources/mapper/modules/course/CourseHandoutsMapper.xml

@@ -47,6 +47,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sort" column="sort"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseHandoutsVo" id="CourseHandoutsVoResult">
+        <result property="handoutsId" column="handouts_id"/>
+        <result property="status" column="status"/>
+        <result property="encoder" column="encoder"/>
+        <result property="canDownload" column="can_download"/>
+        <result property="url" column="url"/>
+        <result property="urlName" column="url_name"/>
+        <result property="handoutsName" column="handouts_name"/>
+    </resultMap>
+
     <select id="findFileList" resultMap="CourseFileVoResult">
         SELECT
             cf.*
@@ -120,7 +130,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT * from course_handouts where encoder = #{encoder} and tenant_id = #{newTenantId}
     </select>
 
-    <select id="queryByGoodsList" parameterType="com.zhongzheng.modules.course.bo.CourseHandoutsQueryBo"  resultMap="CourseHandoutsResult">
+    <select id="queryByGoodsList" parameterType="com.zhongzheng.modules.course.bo.CourseHandoutsQueryBo"  resultMap="CourseHandoutsVoResult">
         SELECT
         s.handouts_name,s.can_download,cf.*
         FROM