he2802 před 4 roky
rodič
revize
652cc0453c

+ 27 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/vo/CourseGoodsVo.java

@@ -0,0 +1,27 @@
+package com.zhongzheng.modules.course.vo;
+
+import com.zhongzheng.common.annotation.Excel;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+
+/**
+ * 课程视图对象 mall_package
+ *
+ * @author hjl
+ * @date 2021-10-09
+ */
+@Data
+@ApiModel("课程商品视图对象")
+public class CourseGoodsVo {
+	private static final long serialVersionUID = 1L;
+
+	@ApiModelProperty("商品id")
+	private Long goodsId;
+
+	/** 商品名称 */
+	@Excel(name = "商品名称")
+	@ApiModelProperty("商品名称")
+	private String goodsName;
+}

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

@@ -8,7 +8,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import java.util.Date;
-
+import java.util.List;
 
 
 /**
@@ -110,4 +110,6 @@ public class CourseVo {
 	private Long createTime;
 	@ApiModelProperty("修改时间")
 	private Long updateTime;
+	@ApiModelProperty("商品列表")
+	private List<CourseGoodsVo> goodsList;
 }

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

@@ -54,9 +54,13 @@
         <result property="schoolName" column="school_name"/>
         <result property="categoryName" column="category_name"/>
         <result property="subjectName" column="subject_name"/>
+        <collection property="goodsList" javaType="java.util.List" resultMap="CourseGoodsListResult"/>
     </resultMap>
 
-
+    <resultMap type="com.zhongzheng.modules.course.vo.CourseGoodsVo" id="CourseGoodsListResult">
+        <result property="goodsName" column="goods_name"/>
+        <result property="goodsId" column="goods_id"/>
+    </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.course.bo.CourseQueryBo" resultMap="CourseResultVo">
         SELECT
@@ -66,7 +70,9 @@
         cb.business_name,
         s.school_name,
         m.category_name,
-        cs.subject_name
+        cs.subject_name,
+        g.goods_name,
+        g.goods_id
         FROM
         course c
         LEFT JOIN course_education_type cet ON c.education_type_id = cet.id
@@ -75,6 +81,8 @@
         LEFT JOIN school s ON s.id = c.school_id
         LEFT JOIN major m ON c.major_id = m.id
         LEFT JOIN course_subject cs ON cs.id = c.subject_id
+        LEFT JOIN goods_course gc ON gc.course_id = c.course_id
+        LEFT JOIN goods g ON gc.goods_id = g.goods_id
         WHERE
         1 = 1
         <if test="status != null and status.size()!=0 ">