Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -31,6 +31,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private String id;
 
     /**
+     * 合同ID
+     */
+    @ApiModelProperty("合同ID")
+    private String contractId;
+
+    /**
      * 订单编号
      */
     @ApiModelProperty("订单编号")
@@ -255,6 +261,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
     private boolean contractCreateBy;
 
     /**
+     * 下单人(非持久化字段)
+     */
+    @ApiModelProperty("下单人")
+    private String contractCreateByName;
+
+    /**
      * 是否展示审核按钮(非持久化字段)
      */
     @TableField(exist = false)

@@ -32,6 +32,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
     private String id;
 
     /**
+     * 合同ID
+     */
+    private String contractId;
+
+    /**
      * 订单编号
      */
     private String orderNo;
@@ -201,6 +206,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
      */
     private String contractCreateById;
 
+    /**
+     * 下单人(非持久化字段)
+     */
+    @TableField(exist = false)
+    private String contractCreateByName;
+
 
     /**
      * 是否展示审核按钮(非持久化字段)

@@ -17,6 +17,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
     private static final long serialVersionUID = 1L;
 
     /**
+     * 合同ID
+     */
+    @ApiModelProperty("合同ID")
+    private String contractId;
+
+    /**
      * 订单编号
      */
     @ApiModelProperty("订单编号")

@@ -4,6 +4,7 @@
 
     <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
         <id column="id" property="id"/>
+        <result column="contract_id" property="contractId"/>
         <result column="order_no" property="orderNo"/>
         <result column="supply_unit" property="supplyUnit"/>
         <result column="ordering_unit" property="orderingUnit"/>
@@ -36,6 +37,7 @@
         <result column="total_quantity" property="totalQuantity"/>
         <result column="packaging_fee" property="packagingFee"/>
         <result column="contract_create_by_id" property="contractCreateById"/>
+        <result column="contract_create_by_name" property="contractCreateByName"/>
         <result column="create_by_id" property="createById"/>
         <result column="create_by" property="createBy"/>
         <result column="update_by_id" property="updateById"/>
@@ -47,6 +49,7 @@
     <sql id="PurchaseOrderInfo_sql">
         SELECT
             tb.id,
+            tb.contract_id,
             tb.order_no,
             tb.supply_unit,
             tb.ordering_unit,
@@ -79,6 +82,7 @@
             tb.total_quantity,
             tb.packaging_fee,
             tb.contract_create_by_id,
+            su.name as contract_create_by_name,
             tb.create_by_id,
             tb.create_by,
             tb.update_by_id,
@@ -90,6 +94,7 @@
         left join sys_dept as sd on sd.id = tb.dept_id
         left join base_data_workshop as ws on ws.id = tb.workshop_id
         left join customer_credit as cc on cc.id = tb.customer_credit_id
+        left join sys_user as su on su.id = tb.contract_create_by_id
     </sql>
 
     <select id="query" resultMap="PurchaseOrderInfo">