fix 讲义列表

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

@@ -33,12 +33,9 @@ public class CourseFileAddBo {
     /** 修改时间 */
     @ApiModelProperty("修改时间")
     private Long updateTime;
-    /** 主ID */
-    @ApiModelProperty("主ID")
-    private Long majorId;
-    /** 1讲义 */
-    @ApiModelProperty("1讲义")
-    private Integer type;
+    /** 讲义ID */
+    @ApiModelProperty("讲义ID")
+    private Long handoutsId;
     /** 排序 */
     @ApiModelProperty("排序")
     private Integer sort;

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

@@ -38,13 +38,9 @@ public class CourseFileEditBo {
     @ApiModelProperty("修改时间")
     private Long updateTime;
 
-    /** 主ID */
-    @ApiModelProperty("主ID")
-    private Long majorId;
-
-    /** 1讲义 */
-    @ApiModelProperty("1讲义")
-    private Integer type;
+    /** 讲义ID */
+    @ApiModelProperty("讲义ID")
+    private Long handoutsId;
 
     /** 排序 */
     @ApiModelProperty("排序")

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

@@ -45,12 +45,9 @@ public class CourseFileQueryBo extends BaseEntity {
 	/** 1启用 0关闭 */
 	@ApiModelProperty("1启用 0关闭")
 	private Integer status;
-	/** 主ID */
-	@ApiModelProperty("主ID")
-	private Long majorId;
-	/** 1讲义 */
-	@ApiModelProperty("1讲义")
-	private Integer type;
+	/** 讲义ID */
+	@ApiModelProperty("讲义ID")
+	private Long handoutsId;
 	/** 排序 */
 	@ApiModelProperty("排序")
 	private Integer sort;

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/domain/CourseFile.java

@@ -38,10 +38,8 @@ private static final long serialVersionUID=1L;
     /** 修改时间 */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
-    /** 主ID */
-    private Long majorId;
-    /** 1讲义 */
-    private Integer type;
+    /** 讲义 */
+    private Long handoutsId;
     /** 排序 */
     private Integer sort;
 }

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

@@ -41,8 +41,7 @@ public class CourseFileServiceImpl extends ServiceImpl<CourseFileMapper, CourseF
         lqw.eq(StrUtil.isNotBlank(bo.getUrl()), CourseFile::getUrl, bo.getUrl());
         lqw.like(StrUtil.isNotBlank(bo.getUrlName()), CourseFile::getUrlName, bo.getUrlName());
         lqw.eq(bo.getStatus() != null, CourseFile::getStatus, bo.getStatus());
-        lqw.eq(bo.getMajorId() != null, CourseFile::getMajorId, bo.getMajorId());
-        lqw.eq(bo.getType() != null, CourseFile::getType, bo.getType());
+        lqw.eq(bo.getHandoutsId() != null, CourseFile::getHandoutsId, bo.getHandoutsId());
         lqw.eq(bo.getSort() != null, CourseFile::getSort, bo.getSort());
         return entity2Vo(this.list(lqw));
     }

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

@@ -123,8 +123,7 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
             for (int i = 0; i < bo.getFileList().size(); i++) {
                 CourseFileAddBo item = bo.getFileList().get(i);
                 CourseFile addItem = new CourseFile();
-                addItem.setMajorId(add.getHandoutsId());
-                addItem.setType(1);
+                addItem.setHandoutsId(add.getHandoutsId());
                 addItem.setUrl(item.getUrl());
                 addItem.setSort(item.getSort());
                 addItem.setUrlName(item.getUrlName());
@@ -155,13 +154,12 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
         }
         //文件列表
         if (bo.getFileList() != null && bo.getFileList().size() > 0) {
-            iCourseFileService.remove(new LambdaQueryWrapper<CourseFile>().eq(CourseFile::getType, 1).eq(CourseFile::getMajorId, update.getHandoutsId()));
+            iCourseFileService.remove(new LambdaQueryWrapper<CourseFile>().eq(CourseFile::getHandoutsId, update.getHandoutsId()));
             Collection<CourseFile> coll = new HashSet<>();
             for (int i = 0; i < bo.getFileList().size(); i++) {
                 CourseFileAddBo item = bo.getFileList().get(i);
                 CourseFile addItem = new CourseFile();
-                addItem.setMajorId(update.getHandoutsId());
-                addItem.setType(1);
+                addItem.setHandoutsId(update.getHandoutsId());
                 addItem.setUrl(item.getUrl());
                 addItem.setSort(item.getSort());
                 addItem.setUrlName(item.getUrlName());

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

@@ -36,14 +36,10 @@ public class CourseFileVo {
 	@Excel(name = "1启用 0关闭")
 	@ApiModelProperty("1启用 0关闭")
 	private Integer status;
-	/** 主ID */
-	@Excel(name = "主ID")
-	@ApiModelProperty("主ID")
-	private Long majorId;
-	/** 1讲义 */
-	@Excel(name = "1讲义")
-	@ApiModelProperty("1讲义")
-	private Integer type;
+
+	@Excel(name = "讲义")
+	@ApiModelProperty("讲义")
+	private Integer handoutsId;
 	/** 排序 */
 	@Excel(name = "排序")
 	@ApiModelProperty("排序")

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

@@ -11,6 +11,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="handoutsUrl" column="handouts_url"/>
         <result property="encoder" column="encoder"/>
         <result property="canDownload" column="can_download"/>
+        <collection property="fileList" column="handouts_id" select="findFileList"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.domain.CourseHandoutsBusiness" id="CourseHandoutsBusinessResult">
@@ -34,6 +35,26 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="projectId" column="project_id"/>
     </resultMap>
 
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseFileVo" id="CourseFileVoResult">
+        <result property="fileId" column="file_id"/>
+        <result property="url" column="url"/>
+        <result property="urlName" column="url_name"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="majorId" column="major_id"/>
+        <result property="type" column="type"/>
+        <result property="sort" column="sort"/>
+    </resultMap>
+
+    <select id="findFileList" resultMap="CourseFileVoResult">
+        SELECT
+            cf.*
+        FROM
+            course_file cf
+        WHERE
+            cf.handouts_id =#{handouts_id}
+    </select>
 
     <select id="selectEntity" parameterType="Long"  resultMap="CourseHandoutsBusinessVoResult">
         SELECT