submit

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

@@ -385,4 +385,7 @@ public class GoodsUserVo {
 	@Excel(name = "每天最大节学习数量")
 	@ApiModelProperty("每天最大节学习数量")
 	private Long sectionMaxNum;
+	@ApiModelProperty("0不限制 2限制整个目录顺序")
+	private Integer goodsLearningOrder;
+
 }

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

@@ -207,6 +207,7 @@
         <result property="serviceEndTime" column="service_end_time"/>
         <result property="subjectNames" column="subject_names"/>
         <result property="sectionNum" column="section_num"/>
+        <result property="goodsLearningOrder" column="goods_learning_order"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassGradeVo" id="ClassGradeVoResult">
@@ -518,6 +519,7 @@
         og.grade_id,
         og.service_start_time,
         og.service_end_time,
+        cb.goods_learning_order,
         (SELECT cet.education_name FROM  course_education_type cet  where cet.id = g.education_type_id) as education_name,
         (SELECT cet.project_name FROM  course_project_type cet where cet.id = g.project_id) as project_name,
         (SELECT cet.business_name FROM  course_business cet  where cet.id = g.business_id) as business_name,
@@ -544,6 +546,7 @@
         `order` o
         LEFT JOIN order_goods og ON og.order_sn = o.order_sn
         LEFT JOIN goods g on og.goods_id = g.goods_id
+        LEFT JOIN course_business cb on g.business_id = cb.id
         <if test="userId != null and userId != ''">
             LEFT JOIN (SELECT * from  user_subscribe where subscribe_id in (SELECT MAX(subscribe_id) from user_subscribe where user_id = #{userId} and  subscribe_status = 1 GROUP BY order_goods_id)) us on us.order_goods_id = og.order_goods_id
         </if>