fix 课程

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

@@ -142,6 +142,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         GoodsVo goodsVo =  iGoodsService.queryById(bo.getGoodsId());
         CourseAddBo addBo = new CourseAddBo();
         addBo.setCourseName(goodsVo.getGoodsName());
+        addBo.setStatus(1);
         addBo.setEducationTypeId(goodsVo.getEducationTypeId());
         addBo.setProjectId(goodsVo.getProjectId());
         addBo.setBusinessId(goodsVo.getBusinessId());
@@ -149,7 +150,7 @@ public class CourseMenuServiceImpl extends ServiceImpl<CourseMenuMapper, CourseM
         GoodsCourseAddBo courseAddBo = new GoodsCourseAddBo();
         courseAddBo.setCourseId(courseId);
         courseAddBo.setGoodsId(bo.getGoodsId());
-        courseAddBo.setShow(0); //隐藏课程
+        courseAddBo.setCourseShow(0); //隐藏课程
         courseAddBo.setSort(0);
         iGoodsCourseService.insertByAddBo(courseAddBo); //绑定商品和节
         boolean result = false;

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

@@ -112,4 +112,7 @@ public class CourseVo {
 	private Long updateTime;
 	@ApiModelProperty("商品列表")
 	private List<CourseGoodsVo> goodsList;
+	/** 1显示 0隐藏 */
+	@ApiModelProperty("1显示 0隐藏")
+	private Integer courseShow;
 }

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

@@ -1,5 +1,6 @@
 package com.zhongzheng.modules.goods.bo;
 
+import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -122,8 +123,10 @@ public class GoodsAddBo {
     @ApiModelProperty("试卷拍照设置")
     private GoodsPhotoExamConfigAddBo goodsPhotographExamConfig;
     @ApiModelProperty("讲义id")
-
     private Long handoutsId;
+    /** 菜单列表 */
+    @ApiModelProperty("模块章菜单列表")
+    private List<CourseMenuAddBo> menuList;
 
     /** 补考或前培开始时间 */
     @ApiModelProperty("补考或前培开始时间")

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

@@ -29,5 +29,5 @@ public class GoodsCourseAddBo {
     private Integer sort;
     /** 1显示 0隐藏 */
     @ApiModelProperty("1显示 0隐藏")
-    private Integer show;
+    private Integer courseShow;
 }

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

@@ -35,5 +35,5 @@ public class GoodsCourseEditBo {
 
     /** 1显示 0隐藏 */
     @ApiModelProperty("1显示 0隐藏")
-    private Integer show;
+    private Integer courseShow;
 }

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

@@ -49,5 +49,5 @@ public class GoodsCourseQueryBo extends BaseEntity {
 
 	/** 1显示 0隐藏 */
 	@ApiModelProperty("1显示 0隐藏")
-	private Integer show;
+	private Integer courseShow;
 }

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

@@ -2,6 +2,7 @@ package com.zhongzheng.modules.goods.bo;
 
 import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.zhongzheng.modules.course.bo.CourseMenuAddBo;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -139,6 +140,13 @@ public class GoodsEditBo {
     @ApiModelProperty("试听列表")
     private List<GoodsAuditionConfigEditBo> auditionList;
 
+    /** 菜单列表 */
+    @ApiModelProperty("模块章菜单列表")
+    private List<CourseMenuAddBo> menuList;
+
+    @ApiModelProperty("隐藏绑定的课程ID")
+    private Long courseId;
+
     /** 播放设置 */
     @ApiModelProperty("播放设置")
     private GoodsPlayConfigAddBo playConfig;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/domain/GoodsCourse.java

@@ -34,5 +34,5 @@ private static final long serialVersionUID=1L;
     /** 排序 */
     private Integer sort;
     /** 1显示 0隐藏 */
-    private Integer show;
+    private Integer courseShow;
 }

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

@@ -11,6 +11,7 @@ import com.zhongzheng.common.exception.CustomException;
 import com.zhongzheng.common.utils.DateUtils;
 import com.zhongzheng.common.utils.ServletUtils;
 import com.zhongzheng.modules.course.bo.CourseChapterSectionListAddBo;
+import com.zhongzheng.modules.course.bo.CourseMenuListAddBo;
 import com.zhongzheng.modules.course.bo.CourseMenuQueryBo;
 import com.zhongzheng.modules.course.bo.CourseQueryBo;
 import com.zhongzheng.modules.course.domain.CourseChapterSection;
@@ -217,7 +218,7 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         }
         boolean result = this.save(add);
         //课程列表
-        if(bo.getCourseList()!=null){
+        if(bo.getCourseList()!=null&&bo.getCourseList().size()>0){
             Collection<GoodsCourse> coll = new HashSet<>();
             for(int i=0;i<bo.getCourseList().size();i++){
                 GoodsCourseAddBo item = bo.getCourseList().get(i);
@@ -229,7 +230,13 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
             }
             iGoodsCourseService.saveBatch(coll);
         }
-
+        //模块章列表
+        if(bo.getMenuList()!=null&&bo.getMenuList().size()>0){
+            CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
+            menuListAddBo.setGoodsId(add.getGoodsId());
+            menuListAddBo.setMenuList(bo.getMenuList());
+            iCourseMenuService.insertByGoodsAddBo(menuListAddBo);
+        }
         return result;
     }
 
@@ -312,7 +319,13 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
         if(bo.getGoodsPhotographExamConfig()!=null){
             update.setGoodsPhotoExamConfig(JSON.toJSONString(bo.getGoodsPhotographExamConfig()));
         }
-
+        //模块章列表
+        if(bo.getMenuList()!=null&&bo.getMenuList().size()>0){
+            CourseMenuListAddBo menuListAddBo = new CourseMenuListAddBo();
+            menuListAddBo.setCourseId(bo.getCourseId());
+            menuListAddBo.setMenuList(bo.getMenuList());
+            iCourseMenuService.updateByEditBo(menuListAddBo);
+        }
         return this.updateById(update);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsCourseVo.java

@@ -40,5 +40,5 @@ public class GoodsCourseVo {
 	/** 1显示 0隐藏 */
 	@Excel(name = "1显示 0隐藏")
 	@ApiModelProperty("1显示 0隐藏")
-	private Integer show;
+	private Integer courseShow;
 }

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

@@ -9,6 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="goodsId" column="goods_id"/>
         <result property="courseId" column="course_id"/>
         <result property="sort" column="sort"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.goods.vo.GoodsCourseVo" id="GoodsCourseVoResult">
@@ -17,6 +18,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="courseId" column="course_id"/>
         <result property="sort" column="sort"/>
         <result property="goodsType" column="goods_type"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.course.vo.CourseVo" id="CourseResultVo">
@@ -47,6 +49,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="categoryName" column="category_name"/>
         <result property="subjectName" column="subject_name"/>
         <result property="sort" column="g_sort"/>
+        <result property="courseShow" column="course_show"/>
     </resultMap>
 
 
@@ -69,7 +72,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         s.school_name,
         m.category_name,
         cs.subject_name,
-               gc.sort as g_sort
+               gc.sort as g_sort,
+        gc.course_show
         FROM
         goods_course gc
         LEFT JOIN course c ON gc.course_id = c.course_id