fix 讲义列表

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.course.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.zhongzheng.modules.course.vo.CourseFileVo;
+import com.zhongzheng.modules.course.vo.CourseHandoutsBusinessVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -59,4 +60,6 @@ private static final long serialVersionUID=1L;
     @TableField(exist = false)
     private List<CourseFileVo> fileList;
 
+
+
 }

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

@@ -7,12 +7,11 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.*;
-import com.zhongzheng.modules.course.domain.CourseEducationTier;
-import com.zhongzheng.modules.course.domain.CourseFile;
-import com.zhongzheng.modules.course.domain.CourseHandoutsBusiness;
+import com.zhongzheng.modules.course.domain.*;
 import com.zhongzheng.modules.course.service.ICourseFileService;
 import com.zhongzheng.modules.course.service.ICourseHandoutsBusinessService;
 import com.zhongzheng.modules.course.vo.CourseHandoutsBusinessVo;
+import com.zhongzheng.modules.course.vo.CourseMenuExamVo;
 import com.zhongzheng.modules.goods.bo.GoodsCourseAddBo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.domain.GoodsAttached;
@@ -24,7 +23,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.pagehelper.Page;
-import com.zhongzheng.modules.course.domain.CourseHandouts;
 import com.zhongzheng.modules.course.mapper.CourseHandoutsMapper;
 import com.zhongzheng.modules.course.vo.CourseHandoutsVo;
 import com.zhongzheng.modules.course.service.ICourseHandoutsService;
@@ -49,18 +47,21 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
     @Autowired
     private ICourseFileService iCourseFileService;
 
+
     @Override
     public CourseHandoutsVo queryById(Long handoutsId){
-        CourseHandoutsQueryBo courseHandoutsQueryBo = new CourseHandoutsQueryBo();
-        courseHandoutsQueryBo.setId(handoutsId);
-        List<CourseHandoutsVo> courseHandoutsVos = entity2Vo(baseMapper.queryList(courseHandoutsQueryBo));
-        if (CollectionUtils.isEmpty(courseHandoutsVos)){
+        CourseHandouts db = this.baseMapper.selectById(handoutsId);
+        if (Validator.isEmpty(db)){
             throw new CustomException("查无数据");
         }
         //获得讲义业务层
-        CourseHandoutsVo courseHandoutsVo = courseHandoutsVos.get(0);
+        CourseHandoutsVo courseHandoutsVo = BeanUtil.toBean(db, CourseHandoutsVo.class);
         List<CourseHandoutsBusinessVo> courseHandoutsBusinessVos = baseMapper.selectEntity(courseHandoutsVo.getHandoutsId());
         courseHandoutsVo.setCourseHandoutsBusinessVo(courseHandoutsBusinessVos);
+
+        CourseFileQueryBo queryBo = new CourseFileQueryBo();
+        queryBo.setHandoutsId(courseHandoutsVo.getHandoutsId());
+        courseHandoutsVo.setFileList(iCourseFileService.queryList(queryBo));
         return courseHandoutsVo;
     }
 
@@ -72,7 +73,6 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
 
     @Override
     public List<CourseHandoutsVo> queryByGoodsList(CourseHandoutsQueryBo bo) {
-        bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
         return baseMapper.queryByGoodsList(bo);
     }
 
@@ -127,6 +127,8 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
                 addItem.setUrl(item.getUrl());
                 addItem.setSort(item.getSort());
                 addItem.setUrlName(item.getUrlName());
+                addItem.setCreateTime(DateUtils.getNowTime());
+                addItem.setUpdateTime(DateUtils.getNowTime());
                 coll.add(addItem);
             }
             iCourseFileService.saveBatch(coll);
@@ -163,6 +165,8 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
                 addItem.setUrl(item.getUrl());
                 addItem.setSort(item.getSort());
                 addItem.setUrlName(item.getUrlName());
+                addItem.setCreateTime(DateUtils.getNowTime());
+                addItem.setUpdateTime(DateUtils.getNowTime());
                 coll.add(addItem);
             }
             iCourseFileService.saveBatch(coll);

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

@@ -59,4 +59,6 @@ public class CourseHandoutsVo {
 	@Excel(name = "地址")
 	@ApiModelProperty("地址")
 	private String url;
+
+	private List<CourseFileVo> fileList;
 }

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

@@ -11,7 +11,6 @@ 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">
@@ -35,17 +34,7 @@ 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>
+
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseHandoutsVo" id="CourseHandoutsVoResult">
         <result property="handoutsId" column="handouts_id"/>
@@ -57,14 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="handoutsName" column="handouts_name"/>
     </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