From 9596c6f0f3952b92835a9f7f45d0d9897516b1a4 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Thu, 6 Oct 2022 09:55:25 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=A4=96=E9=87=87?=
 =?UTF-8?q?=E7=94=B3=E8=AF=B7=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AppBaseOutsourcingApplicationVo.java      | 17 ++++++++++--
 .../BaseOutsourcingApplicationMapper.xml      |  8 +++++-
 .../externalPurchase/ExternalPurchaseVo.java  | 27 ++++++++++++++++---
 3 files changed, 45 insertions(+), 7 deletions(-)

diff --git a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java
index 24f1be90c4..787836baaf 100644
--- a/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java
+++ b/anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseoutsourcingapplication/AppBaseOutsourcingApplicationVo.java
@@ -37,9 +37,9 @@ public class AppBaseOutsourcingApplicationVo implements Vo {
     private String insideCode;
     @ApiModelProperty("采购单位名称")
     private String purchasingUnitName;
-    @ApiModelProperty("开户银行")
+    @ApiModelProperty("车款开户银行")
     private String depositBankName;
-    @ApiModelProperty("银行账号")
+    @ApiModelProperty("车款银行账号")
     private String bankAccount;
     @ApiModelProperty("采购价格")
     private String purchasePrice;
@@ -62,4 +62,17 @@ public class AppBaseOutsourcingApplicationVo implements Vo {
     private String configSid;
 
     private AppBaseVesionVo carDetailPage;
+    @ApiModelProperty("车款收款账户")
+    private String accountName;
+    @ApiModelProperty("订金开户银行")
+    private String modelBankName;
+    @ApiModelProperty("订金银行账号")
+    private String modelBankAccount;
+    @ApiModelProperty("订金收款账户名称")
+    private String modelAccountName;
+    @ApiModelProperty("是否先付款")
+    private String isBeforePaymentKey;
+    @ApiModelProperty("是否先付款 1是，0否")
+    private String isBeforePaymentValue;
+
 }
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
index 68c2ac1a08..2c0872471e 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationMapper.xml
@@ -64,7 +64,13 @@
 			totalExpenseAmount,
 			remarks,
 			modelSid,
-			configSid
+			configSid,
+			accountName,
+			modelBankName,
+			modelBankAccount,
+			modelAccountName,
+		    isBeforePayment as isBeforePaymentKey,
+			case isBeforePayment when 1 then '是' when 0 then '否' end as isBeforePaymentValue
 		from base_outsourcing_application
 		where sid = #{sid}
     </select>
diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java
index 0ac1b64e8e..ade10d7f3f 100644
--- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java
+++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/externalPurchase/ExternalPurchaseVo.java
@@ -46,11 +46,11 @@ public class ExternalPurchaseVo implements Vo {
     @ApiModelProperty("采购单位名称")
     @JsonProperty("purchasingUnit")
     private String purchasingUnitName;
-    @ApiModelProperty("开户银行")
-    @JsonProperty("bankDeposit")
+    @ApiModelProperty("车款开户银行")
+    @JsonProperty("carPaymentAccount")
     private String depositBankName;
-    @ApiModelProperty("银行账号")
-    @JsonProperty("invoBankNum")
+    @ApiModelProperty("车款银行账号")
+    @JsonProperty("carPaymentBankDeposit")
     private String bankAccount;
     @ApiModelProperty("采购价格")
     private String purchasePrice;
@@ -76,4 +76,23 @@ public class ExternalPurchaseVo implements Vo {
     private String configSid;
 
     private ExterVesionVo carDetailPage;
+
+    @ApiModelProperty("车款收款账户")
+    @JsonProperty("carPaymentBankAccount")
+    private String accountName;
+    @ApiModelProperty("订金开户银行")
+    @JsonProperty("depositBankDeposit")
+    private String modelBankName;
+    @ApiModelProperty("订金银行账号")
+    @JsonProperty("depositBankAccount")
+    private String modelBankAccount;
+    @ApiModelProperty("订金收款账户名称")
+    @JsonProperty("depositAccount")
+    private String modelAccountName;
+    @ApiModelProperty("是否先付款")
+    @JsonProperty("firstPayKey")
+    private String isBeforePaymentKey;
+    @ApiModelProperty("是否先付款 1是，0否")
+    @JsonProperty("firstPay")
+    private String isBeforePaymentValue;
 }