fix 讲义列表

zhongzheng-api/src/main/java/com/zhongzheng/controller/course/CourseHandoutsController.java

@@ -21,7 +21,7 @@ import java.util.List;
 
 /**
  * 讲义列Controller
- * 
+ *
  * @author ruoyi
  * @date 2021-11-02
  */
@@ -44,7 +44,16 @@ public class CourseHandoutsController extends BaseController {
         return getDataTable(list);
     }
 
-
+    /**
+     * 查询讲义列列表
+     */
+    @ApiOperation("查询商品讲义列列表")
+    @GetMapping("/listByGoods")
+    public TableDataInfo<CourseHandoutsVo> listByGoods(CourseHandoutsQueryBo bo) {
+        startPage();
+        List<CourseHandoutsVo> list = iCourseHandoutsService.queryByGoodsList(bo);
+        return getDataTable(list);
+    }
 
     /**
      * 获取讲义列详细信息

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

@@ -74,6 +74,8 @@ public class CourseHandoutsQueryBo extends BaseEntity {
 	@ApiModelProperty("文件名字")
 	private String urlName;
 
-
+	/** goodsId */
+	@ApiModelProperty("商品ID")
+	private Long goodsId;
 
 }

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

@@ -22,6 +22,8 @@ public interface CourseHandoutsMapper extends BaseMapper<CourseHandouts> {
 
     Collection<CourseHandouts> queryList(CourseHandoutsQueryBo bo);
 
+    Collection<CourseHandouts> 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/ICourseHandoutsService.java

@@ -28,6 +28,8 @@ public interface ICourseHandoutsService extends IService<CourseHandouts> {
 	 */
 	List<CourseHandoutsVo> queryList(CourseHandoutsQueryBo bo);
 
+	List<CourseHandoutsVo> queryByGoodsList(CourseHandoutsQueryBo bo);
+
 	/**
 	 * 根据新增业务对象插入讲义列
 	 * @param bo 讲义列新增业务对象

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

@@ -28,9 +28,7 @@ import com.zhongzheng.modules.course.vo.CourseHandoutsVo;
 import com.zhongzheng.modules.course.service.ICourseHandoutsService;
 import org.springframework.util.CollectionUtils;
 
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -68,6 +66,12 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
         return entity2Vo(baseMapper.queryList(bo));
     }
 
+    @Override
+    public List<CourseHandoutsVo> queryByGoodsList(CourseHandoutsQueryBo bo) {
+        bo.setStatus(new ArrayList<Integer>(Arrays.asList(1)));
+        return entity2Vo(baseMapper.queryByGoodsList(bo));
+    }
+
     /**
     * 实体类转化成视图对象
     *

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

@@ -99,4 +99,24 @@ 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
+        s.*
+        FROM
+        goods_handouts gh
+        LEFT JOIN course_handouts s ON gh.handouts_id = s.handouts_id
+        WHERE
+        1 = 1
+        <if test="status != null and status.size()!=0 ">
+            AND s.status in
+            <foreach collection="status" item="item" index="index" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+        <if test="goodsId != null and goodsId != ''">
+            AND gh.goods_id = #{goodsId}
+        </if>
+        ORDER BY gh.sort
+    </select>
+
 </mapper>