商品课程

zhongzheng-admin/src/main/java/com/zhongzheng/controller/goods/GoodsCourseController.java

@@ -49,10 +49,24 @@ public class GoodsCourseController extends BaseController {
      */
     @ApiOperation("查询商品课程关系列表")
     @PreAuthorize("@ss.hasPermi('system:course:list')")
+    @GetMapping("/getList")
+    public TableDataInfo<CourseVo> getList(GoodsCourseQueryBo bo) {
+        startPage();
+        List<CourseVo> list = iGoodsCourseService.selectList(bo);
+        return getDataTable(list);
+    }
+
+    /**
+     * 查询商品课程关系列表
+     */
+    @ApiOperation("ID查询商品课程关系列表")
+    @PreAuthorize("@ss.hasPermi('system:course:list')")
     @GetMapping("/list/{id}")
-    public TableDataInfo<CourseVo> list(@PathVariable Long id) {
+    public TableDataInfo<CourseVo> list(@PathVariable("id" ) Long id) {
         startPage();
-        List<CourseVo> list = iGoodsCourseService.selectList(id);
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(id);
+        List<CourseVo> list = iGoodsCourseService.selectList(courseQueryBo);
         return getDataTable(list);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/bo/GoodsCourseQueryBo.java

@@ -50,4 +50,9 @@ public class GoodsCourseQueryBo extends BaseEntity {
 	/** 1显示 0隐藏 */
 	@ApiModelProperty("1显示 0隐藏")
 	private Integer courseShow;
+
+	@ApiModelProperty("关键字")
+	private String keyWord;
+
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsCourseMapper.java

@@ -18,7 +18,7 @@ import java.util.List;
  * @date 2021-10-12
  */
 public interface GoodsCourseMapper extends BaseMapper<GoodsCourse> {
-    List<CourseVo> getList(Long goodsId);
+    List<CourseVo> getList(GoodsCourseQueryBo bo);
     List<GoodsCourseMoreVo> selectListMore(GoodsCourseQueryBo bo);
     List<GoodsCourseVo> selectGoodsList(Long courseId);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsCourseService.java

@@ -30,7 +30,7 @@ public interface IGoodsCourseService extends IService<GoodsCourse> {
 	 */
 	List<GoodsCourseVo> queryList(GoodsCourseQueryBo bo);
 
-	List<CourseVo> selectList(Long goodsId);
+	List<CourseVo> selectList(GoodsCourseQueryBo bo);
 
 	List<GoodsCourseMoreVo> selectListMore(List<Long> goodsIds);
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsCourseServiceImpl.java

@@ -51,8 +51,8 @@ public class GoodsCourseServiceImpl extends ServiceImpl<GoodsCourseMapper, Goods
     }
 
     @Override
-    public List<CourseVo> selectList(Long goodsId) {
-        return this.baseMapper.getList(goodsId);
+    public List<CourseVo> selectList(GoodsCourseQueryBo bo) {
+        return this.baseMapper.getList(bo);
     }
 
     @Override

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -134,7 +134,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             list.forEach(goodsVo -> {
                 AtomicReference<Double> classHours = new AtomicReference<>(0.0);
                 //查询课程列表
-                List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+                GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+                courseQueryBo.setGoodsId(goodsVo.getGoodsId());
+                List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
                 if (courseVoList != null && courseVoList.size() > 0) {
                     courseVoList.forEach(courseVo -> {
                         //获取模块信息
@@ -569,7 +571,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     @Override
     public List<CourseModuleFreeExamVo> moduleFreeExamList(Long goodsId) {
         List<CourseModuleFreeExamVo> moduleExamList = new ArrayList<>();
-        List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsId);
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(goodsId);
+        List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
         for(CourseVo vo : courseVoList){
             CourseMenuQueryBo bo = new CourseMenuQueryBo();
             bo.setCourseId(vo.getCourseId());

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderGoodsServiceImpl.java

@@ -26,6 +26,7 @@ import com.zhongzheng.modules.exam.service.IExamApplyGoodsService;
 import com.zhongzheng.modules.exam.service.IExamApplyUserService;
 import com.zhongzheng.modules.exam.service.IExamBeforeService;
 import com.zhongzheng.modules.exam.vo.ExamApplyGoodsVo;
+import com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo;
 import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.service.IGoodsCourseService;
 import com.zhongzheng.modules.goods.service.IGoodsService;
@@ -384,7 +385,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
 
     @Override
     public List<OrderGoodsVo> listLiveGoodsList(GoodsQueryBo bo) {
-        List<CourseVo> courseVoList = iGoodsCourseService.selectList(bo.getGoodsId());
+        GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+        courseQueryBo.setGoodsId(bo.getGoodsId());
+        List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
         Integer totalLiveNum = 0; //总直播次数（含回放）
         Integer overLiveNum = 0; //已经直播次数
         Long liveTime = 0L; //直播总秒数
@@ -424,7 +427,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
         List<OrderGoodsVo> orderGoodsVos = baseMapper.selectOrderGoods(orderGoodsQueryBo);
         for(OrderGoodsVo goodsVo : orderGoodsVos){
             if(goodsVo.getGoodsType()==1){
-                List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+                GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+                courseQueryBo.setGoodsId(goodsVo.getGoodsId());
+                List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
                 for(CourseVo courseVo : courseVoList){
                     UserStudyRecordQueryBo queryBo = new UserStudyRecordQueryBo();
                     queryBo.setCourseId(courseVo.getCourseId());
@@ -446,7 +451,9 @@ public class OrderGoodsServiceImpl extends ServiceImpl<OrderGoodsMapper, OrderGo
             Long startTime = null;
             Long endTime = null;
             Integer sectionNum = 0;
-            List<CourseVo> courseVoList = iGoodsCourseService.selectList(goodsVo.getGoodsId());
+            GoodsCourseQueryBo courseQueryBo = new GoodsCourseQueryBo();
+            courseQueryBo.setGoodsId(goodsVo.getGoodsId());
+            List<CourseVo> courseVoList = iGoodsCourseService.selectList(courseQueryBo);
             for(CourseVo courseVo : courseVoList){
                 UserStudyRecordQueryBo queryBo = new UserStudyRecordQueryBo();
                 queryBo.setCourseId(courseVo.getCourseId());

zhongzheng-system/src/main/resources/mapper/modules/goods/GoodsCourseMapper.xml

@@ -66,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             gc.*,g.goods_type from goods_course gc LEFT JOIN goods g ON gc.goods_id = g.goods_id where gc.course_id = #{courseId}
     </select>
 
-    <select id="getList" parameterType="Long" resultMap="CourseResultVo">
+    <select id="getList" parameterType="com.zhongzheng.modules.goods.bo.GoodsCourseQueryBo" resultMap="CourseResultVo">
         SELECT
         c.*,
         cet.education_name,
@@ -89,6 +89,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN course_subject cs ON cs.id = c.subject_id
         WHERE
         gc.goods_id = #{goodsId} AND c.`status` = 1
+        <if test="keyWord != null and keyWord != ''">
+            AND (c.course_name  like concat('%', #{keyWord}, '%') or c.code  like concat('%', #{keyWord}, '%'))
+        </if>
+
         order by gc.sort
     </select>