Jelajahi Sumber

fix 计费单商品

he2802 4 tahun lalu
induk
melakukan
d31c865802

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/order/vo/OrderGoodsVo.java

@@ -106,4 +106,6 @@ public class OrderGoodsVo {
 	@Excel(name = "备注")
 	@ApiModelProperty("备注")
 	private String remark;
+	@ApiModelProperty("录单人")
+	private String createBy;
 }

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

@@ -124,16 +124,7 @@
         </if>
     </select>
 
-    <select id="selectCourseList_COUNT" resultType="Long">
-        SELECT
-            c.course_id
-        FROM
-            course c
-        WHERE
-        c.status = 1
-
-
-    </select>
+   
 
     <select id="selectDetailById" parameterType="Long"  resultMap="CourseResultVo">
         SELECT

+ 4 - 1
zhongzheng-system/src/main/resources/mapper/modules/order/OrderGoodsMapper.xml

@@ -51,6 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="educationName" column="education_name"/>
         <result property="projectName" column="project_name"/>
         <result property="businessName" column="business_name"/>
+        <result property="createBy" column="create_by"/>
     </resultMap>
 
     <select id="selectList" parameterType="com.zhongzheng.modules.order.bo.OrderGoodsQueryBo" resultMap="OrderGoodsResultVo">
@@ -82,13 +83,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         g.goods_name,
         cet.education_name,
         cpt.project_name,
-        cb.business_name
+        cb.business_name,
+        o.create_by
         FROM
         order_goods og
         LEFT JOIN goods g ON og.goods_id = g.goods_id
         LEFT JOIN course_education_type cet ON g.education_type_id = cet.id
         LEFT JOIN course_project_type cpt ON g.project_id = cpt.id
         LEFT JOIN course_business cb ON g.business_id = cb.id
+        LEFT JOIN order o ON og.order_sn = o.order_sn
         WHERE
          og.order_sn =  #{orderSn} AND og.goods_id =  #{goodsId}