From ccd899e5b02444af986c756cb069c8c9aedd66e3 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sat, 12 Feb 2022 09:56:38 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E7=9A=84=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=EF=BC=8C=E5=B0=86=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=BB=86=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProjectDetailServiceImpl.java  | 12 +++++++++++-
 .../com/jero/common/vo/ProjectDetailVO.java     | 17 +++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
index e6f5634a..ce086834 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/service/impl/ProjectDetailServiceImpl.java
@@ -189,7 +189,11 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
             }else{
                 projectDetailVO.setCompanyName(payCompanyManagement.getCompanyName());
             }
-
+            projectDetailVO.setCompanyPhone(payCompanyManagement.getCompanyPhone());
+            projectDetailVO.setDutyCode(payCompanyManagement.getDutyCode());
+            projectDetailVO.setBankAccountName(payCompanyManagement.getBankAccountName());
+            projectDetailVO.setBankAccount(payCompanyManagement.getBankAccount());
+            projectDetailVO.setOpeningBank(payCompanyManagement.getOpeningBank());
             projectDetailVO.setPostalCodeCompany(payCompanyManagement.getPostalCode());
             projectDetailVO.setCompanyAddress(payCompanyManagement.getCompanyAddress());
             PayContactsManagement payContactsManagement = payContactsManagementService.getById(payCommonProject.getContactsTemporaryId());
@@ -216,9 +220,15 @@ public class ProjectDetailServiceImpl implements ProjectDetailService {
             if(Objects.isNull(payCompanyManagementTemporary)){
                 throw new JeroBootException("企业不存在！");
             }
+
             projectDetailVO.setCompanyName(payCompanyManagementTemporary.getCompanyName());
             projectDetailVO.setPostalCodeCompany(payCompanyManagementTemporary.getPostalCode());
             projectDetailVO.setCompanyAddress(payCompanyManagementTemporary.getCompanyAddress());
+            projectDetailVO.setCompanyPhone(payCompanyManagementTemporary.getCompanyPhone());
+            projectDetailVO.setDutyCode(payCompanyManagementTemporary.getDutyCode());
+            projectDetailVO.setBankAccountName(payCompanyManagementTemporary.getBankAccountName());
+            projectDetailVO.setBankAccount(payCompanyManagementTemporary.getBankAccount());
+            projectDetailVO.setOpeningBank(payCompanyManagementTemporary.getOpeningBank());
             PayContactsManagementTemporary payContactsManagementTemporary = payContactsManagementTemporaryService.getById(payCommonProject.getContactsTemporaryId());
             if(Objects.isNull(payContactsManagementTemporary)){
                 throw new JeroBootException("联系人不存在！");
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
index 233feb03..9f91ba1c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/common/vo/ProjectDetailVO.java
@@ -7,6 +7,8 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
+import javax.validation.constraints.NotEmpty;
+import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.math.BigDecimal;
@@ -91,6 +93,21 @@ public class ProjectDetailVO implements Serializable {
     @ApiModelProperty(value = "企业地址")
     private String companyAddress;
 
+    @ApiModelProperty(value = "公司电话")
+    private String companyPhone;
+
+    @ApiModelProperty(value = "信用代码")
+    private String dutyCode;
+
+    @ApiModelProperty(value = "银行户名")
+    private String bankAccountName;
+
+    @ApiModelProperty(value = "开户行")
+    private String openingBank;
+
+    @ApiModelProperty(value = "银行账号")
+    private String bankAccount;
+
 
     /**
      * 企业联系人