朱园亮 / xingyun-erp · Commits

Commit 1a202ac7fb462957b9d059e2bbe582f157db4c10

Authored by yeqianyong
2 parents c99b22a7 b65ac6b8

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

Inline Side-by-side
Showing 4 changed files with 34 additions and 0 deletions
@@ -31,6 +31,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> { @@ -31,6 +31,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
31 private String id; 31 private String id;
32 32
33 /** 33 /**
  34 + * 合同ID
  35 + */
  36 + @ApiModelProperty("合同ID")
  37 + private String contractId;
  38 +
  39 + /**
34 * 订单编号 40 * 订单编号
35 */ 41 */
36 @ApiModelProperty("订单编号") 42 @ApiModelProperty("订单编号")
@@ -255,6 +261,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> { @@ -255,6 +261,12 @@ public class GetPurchaseOrderInfoBo extends BaseBo<PurchaseOrderInfo> {
255 private boolean contractCreateBy; 261 private boolean contractCreateBy;
256 262
257 /** 263 /**
  264 + * 下单人(非持久化字段)
  265 + */
  266 + @ApiModelProperty("下单人")
  267 + private String contractCreateByName;
  268 +
  269 + /**
258 * 是否展示审核按钮(非持久化字段) 270 * 是否展示审核按钮(非持久化字段)
259 */ 271 */
260 @TableField(exist = false) 272 @TableField(exist = false)
@@ -32,6 +32,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { @@ -32,6 +32,11 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
32 private String id; 32 private String id;
33 33
34 /** 34 /**
  35 + * 合同ID
  36 + */
  37 + private String contractId;
  38 +
  39 + /**
35 * 订单编号 40 * 订单编号
36 */ 41 */
37 private String orderNo; 42 private String orderNo;
@@ -201,6 +206,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto { @@ -201,6 +206,12 @@ public class PurchaseOrderInfo extends BaseEntity implements BaseDto {
201 */ 206 */
202 private String contractCreateById; 207 private String contractCreateById;
203 208
  209 + /**
  210 + * 下单人(非持久化字段)
  211 + */
  212 + @TableField(exist = false)
  213 + private String contractCreateByName;
  214 +
204 215
205 /** 216 /**
206 * 是否展示审核按钮(非持久化字段) 217 * 是否展示审核按钮(非持久化字段)
@@ -17,6 +17,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable { @@ -17,6 +17,12 @@ public class CreatePurchaseOrderInfoVo implements BaseVo, Serializable {
17 private static final long serialVersionUID = 1L; 17 private static final long serialVersionUID = 1L;
18 18
19 /** 19 /**
  20 + * 合同ID
  21 + */
  22 + @ApiModelProperty("合同ID")
  23 + private String contractId;
  24 +
  25 + /**
20 * 订单编号 26 * 订单编号
21 */ 27 */
22 @ApiModelProperty("订单编号") 28 @ApiModelProperty("订单编号")
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 4
5 <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo"> 5 <resultMap id="PurchaseOrderInfo" type="com.lframework.xingyun.sc.entity.PurchaseOrderInfo">
6 <id column="id" property="id"/> 6 <id column="id" property="id"/>
  7 + <result column="contract_id" property="contractId"/>
7 <result column="order_no" property="orderNo"/> 8 <result column="order_no" property="orderNo"/>
8 <result column="supply_unit" property="supplyUnit"/> 9 <result column="supply_unit" property="supplyUnit"/>
9 <result column="ordering_unit" property="orderingUnit"/> 10 <result column="ordering_unit" property="orderingUnit"/>
@@ -36,6 +37,7 @@ @@ -36,6 +37,7 @@
36 <result column="total_quantity" property="totalQuantity"/> 37 <result column="total_quantity" property="totalQuantity"/>
37 <result column="packaging_fee" property="packagingFee"/> 38 <result column="packaging_fee" property="packagingFee"/>
38 <result column="contract_create_by_id" property="contractCreateById"/> 39 <result column="contract_create_by_id" property="contractCreateById"/>
  40 + <result column="contract_create_by_name" property="contractCreateByName"/>
39 <result column="create_by_id" property="createById"/> 41 <result column="create_by_id" property="createById"/>
40 <result column="create_by" property="createBy"/> 42 <result column="create_by" property="createBy"/>
41 <result column="update_by_id" property="updateById"/> 43 <result column="update_by_id" property="updateById"/>
@@ -47,6 +49,7 @@ @@ -47,6 +49,7 @@
47 <sql id="PurchaseOrderInfo_sql"> 49 <sql id="PurchaseOrderInfo_sql">
48 SELECT 50 SELECT
49 tb.id, 51 tb.id,
  52 + tb.contract_id,
50 tb.order_no, 53 tb.order_no,
51 tb.supply_unit, 54 tb.supply_unit,
52 tb.ordering_unit, 55 tb.ordering_unit,
@@ -79,6 +82,7 @@ @@ -79,6 +82,7 @@
79 tb.total_quantity, 82 tb.total_quantity,
80 tb.packaging_fee, 83 tb.packaging_fee,
81 tb.contract_create_by_id, 84 tb.contract_create_by_id,
  85 + su.name as contract_create_by_name,
82 tb.create_by_id, 86 tb.create_by_id,
83 tb.create_by, 87 tb.create_by,
84 tb.update_by_id, 88 tb.update_by_id,
@@ -90,6 +94,7 @@ @@ -90,6 +94,7 @@
90 left join sys_dept as sd on sd.id = tb.dept_id 94 left join sys_dept as sd on sd.id = tb.dept_id
91 left join base_data_workshop as ws on ws.id = tb.workshop_id 95 left join base_data_workshop as ws on ws.id = tb.workshop_id
92 left join customer_credit as cc on cc.id = tb.customer_credit_id 96 left join customer_credit as cc on cc.id = tb.customer_credit_id
  97 + left join sys_user as su on su.id = tb.contract_create_by_id
93 </sql> 98 </sql>
94 99
95 <select id="query" resultMap="PurchaseOrderInfo"> 100 <select id="query" resultMap="PurchaseOrderInfo">