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; + /** * 企业联系人