学习计划

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

@@ -214,4 +214,19 @@ public class GoodsVo {
 	@Excel(name = "学习次数")
 	@ApiModelProperty("学习次数")
 	private Long studyCount;
+
+	/** 前培和补考商品关联 */
+	@Excel(name = "前培和补考商品关联")
+	@ApiModelProperty("前培和补考商品关联")
+	private Long makeGoodsId;
+
+	/** 前培和补考商品关联 */
+	@Excel(name = "前培和补考商品关联")
+	@ApiModelProperty("前培和补考商品关联商品名")
+	private String makeGoodsName;
+
+	/** 前培和补考商品关联 */
+	@Excel(name = "前培和补考商品关联")
+	@ApiModelProperty("前培和补考商品关联编码")
+	private String makeGoodsCode;
 }

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

@@ -92,6 +92,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="makeStartTime" column="make_start_time"/>
         <result property="makeEndTime" column="make_end_time"/>
         <result property="studyCount" column="study_count"/>
+        <result property="makeGoodsName" column="make_goods_name"/>
+        <result property="makeGoodsCode" column="make_goods_code"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.exam.vo.ExamNumberGoodsVo" id="ExamNumberGoodsVoResult">
@@ -113,7 +115,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         cb.business_name,
         s.school_name,
         m.category_name,
-        ot.type AS template_type
+        ot.type AS template_type,
+        (SELECT gs.goods_name FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_name,
+        (SELECT gs.code FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_code
         FROM
         goods g
         LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id
@@ -179,7 +183,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cb.business_name,
             s.school_name,
             m.category_name,
-            ot.type AS template_type
+            ot.type AS template_type,
+            (SELECT gs.goods_name FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_name,
+            (SELECT gs.code FROM goods gs where 1=1 and g.make_goods_id = gs.goods_id) as make_goods_code
         FROM
             goods g
                 LEFT JOIN pay_supply ps ON g.supply_id = ps.supply_id