diff --git a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TaxactionDTO.java b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TaxactionDTO.java index 0884e3837..f528c3069 100644 --- a/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TaxactionDTO.java +++ b/mhd-common/mhd-common-core/src/main/java/com/mhd/common/core/domain/dto/wlhy/TaxactionDTO.java @@ -117,4 +117,12 @@ public class TaxactionDTO implements Serializable { private String electricSignature; @ApiModelProperty("是否删除（0-否，1-是）") private Integer isDelete; + @ApiModelProperty("公司名称") + private String companyName; + @ApiModelProperty("公司英文") + private String companyNameEn; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系人电话") + private String contactPhone; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/entity/ReceivingAccount.java b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/entity/ReceivingAccount.java index ed0e904d2..c28caade3 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/entity/ReceivingAccount.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/entity/ReceivingAccount.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.mhd.common.core.web.domain.BaseEntity; +import io.swagger.annotations.ApiModelProperty; import lombok.Data; import lombok.EqualsAndHashCode; @@ -39,4 +40,7 @@ public class ReceivingAccount extends BaseEntity implements Serializable { private String topOrganizationId; /**组织相关*/ private String organizationId; + + @ApiModelProperty("开户银行") + private String accountBank; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java index 5ae2e555e..ed42412d9 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/po/ReceivingAccountPO.java @@ -48,4 +48,7 @@ public class ReceivingAccountPO extends BaseVOEntity { private String topOrganizationId; /**组织相关*/ private String organizationId; + + @ApiModelProperty("开户银行") + private String accountBank; } diff --git a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java index 1225ac1a4..6074a113d 100644 --- a/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java +++ b/mhd_finance/src/main/java/com/linke/finance/domain/receivingAccount/repository/todo/ReceivingAccountDO.java @@ -31,4 +31,7 @@ public class ReceivingAccountDO extends BaseVOEntity { private String topOrganizationId; /**组织相关*/ private String organizationId; + + @ApiModelProperty("开户银行") + private String accountBank; } diff --git a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java index e5dc7c153..af43b623e 100644 --- a/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java +++ b/mhd_finance/src/main/java/com/linke/finance/interfaces/dto/ReceivingAccountDTO.java @@ -40,4 +40,7 @@ public class ReceivingAccountDTO { private String topOrganizationId; /**组织相关*/ private String organizationId; + + @ApiModelProperty("开户银行") + private String accountBank; } diff --git a/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml b/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml index c7e993517..3d739cc50 100644 --- a/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml +++ b/mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml @@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select id, account_name, account_information, del_flag, create_time, update_time, top_organization_id, organization_id + select id, account_name, account_information, del_flag, create_time, update_time, top_organization_id, organization_id,account_bank from receiving_account @@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into receiving_account (account_name, account_information, del_flag, create_time, update_time,top_organization_id, organization_id) + insert into receiving_account (account_name, account_information, del_flag, create_time, update_time,top_organization_id, organization_id,account_bank) values ( @@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{item.accountInformation}, #{item.delFlag}, #{item.createTime}, - #{item.updateTime},#{item.topOrganizationId},#{item.organizationId} + #{item.updateTime},#{item.topOrganizationId},#{item.organizationId},#{item.accountBank} ) diff --git a/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java b/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java index b29a8ba60..e3b7d027b 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java +++ b/mhd_product/src/main/java/com/linke/product/domain/organization/entity/Organization.java @@ -104,6 +104,14 @@ public class Organization extends BaseVOEntity implements Serializable { private String receivingNumber; @ApiModelProperty("联行号") private String interbankNumber; + @ApiModelProperty("公司名称") + private String companyName; + @ApiModelProperty("公司英文") + private String companyNameEn; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系人电话") + private String contactPhone; } diff --git a/mhd_product/src/main/java/com/linke/product/domain/organization/repository/po/OrganizationPo.java b/mhd_product/src/main/java/com/linke/product/domain/organization/repository/po/OrganizationPo.java index 749a9f327..5320af6f6 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/organization/repository/po/OrganizationPo.java +++ b/mhd_product/src/main/java/com/linke/product/domain/organization/repository/po/OrganizationPo.java @@ -119,5 +119,13 @@ public class OrganizationPo extends BaseVOEntity implements Serializable { @ApiModelProperty("是否绑定 1-是，2-否") private Integer isBand; + @ApiModelProperty("公司名称") + private String companyName; + @ApiModelProperty("公司英文") + private String companyNameEn; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系人电话") + private String contactPhone; } diff --git a/mhd_product/src/main/java/com/linke/product/domain/organization/repository/todo/OrganizationCorrelationDO.java b/mhd_product/src/main/java/com/linke/product/domain/organization/repository/todo/OrganizationCorrelationDO.java index 7bd171afb..b49a20345 100644 --- a/mhd_product/src/main/java/com/linke/product/domain/organization/repository/todo/OrganizationCorrelationDO.java +++ b/mhd_product/src/main/java/com/linke/product/domain/organization/repository/todo/OrganizationCorrelationDO.java @@ -55,4 +55,13 @@ public class OrganizationCorrelationDO extends BaseVOEntity{ @ApiModelProperty(name = "权限菜单ID") private Long permissionMenuId; + + @ApiModelProperty("公司名称") + private String companyName; + @ApiModelProperty("公司英文") + private String companyNameEn; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系人电话") + private String contactPhone; } diff --git a/mhd_product/src/main/java/com/linke/product/interfaces/dto/organization/OrganizationDto.java b/mhd_product/src/main/java/com/linke/product/interfaces/dto/organization/OrganizationDto.java index e446ebd4d..f10041ed0 100644 --- a/mhd_product/src/main/java/com/linke/product/interfaces/dto/organization/OrganizationDto.java +++ b/mhd_product/src/main/java/com/linke/product/interfaces/dto/organization/OrganizationDto.java @@ -113,6 +113,14 @@ public class OrganizationDto extends BaseVOEntity implements Serializable { private String receivingNumber; @ApiModelProperty("联行号") private String interbankNumber; + @ApiModelProperty("公司名称") + private String companyName; + @ApiModelProperty("公司英文") + private String companyNameEn; + @ApiModelProperty("联系人") + private String contact; + @ApiModelProperty("联系人电话") + private String contactPhone; @ApiModelProperty(name = "唯一key集合(操作菜单使用)") private List idKeyList; diff --git a/mhd_thrid_party/src/main/java/com/linke/thirdParty/domain/departInterfaceInfo/repository/mapper/SysDepartInterfaceInfoMapper.java b/mhd_thrid_party/src/main/java/com/linke/thirdParty/domain/departInterfaceInfo/repository/mapper/SysDepartInterfaceInfoMapper.java index 63b1bc69e..5cbe55a13 100644 --- a/mhd_thrid_party/src/main/java/com/linke/thirdParty/domain/departInterfaceInfo/repository/mapper/SysDepartInterfaceInfoMapper.java +++ b/mhd_thrid_party/src/main/java/com/linke/thirdParty/domain/departInterfaceInfo/repository/mapper/SysDepartInterfaceInfoMapper.java @@ -61,4 +61,6 @@ public interface SysDepartInterfaceInfoMapper extends BaseMapper list = sysDepartInterfaceInfoApplicationService.queryList(sysDepartInterfaceInfoDo); + for (SysDepartInterfaceInfoPo sysDepartInterfaceInfo : list) { + String s = sysDepartInterfaceInfoMapper.selectOrgNameById(sysDepartInterfaceInfo.getOrganizationId()); + if(StrUtil.isNotBlank(s)) + sysDepartInterfaceInfo.setOrganizationName(s); + + } return getDataTable(list); } diff --git a/mhd_thrid_party/src/main/resources/mapper/departInterfaceInfo/SysDepartInterfaceInfoMapper.xml b/mhd_thrid_party/src/main/resources/mapper/departInterfaceInfo/SysDepartInterfaceInfoMapper.xml index 6c64671ab..114e27984 100644 --- a/mhd_thrid_party/src/main/resources/mapper/departInterfaceInfo/SysDepartInterfaceInfoMapper.xml +++ b/mhd_thrid_party/src/main/resources/mapper/departInterfaceInfo/SysDepartInterfaceInfoMapper.xml @@ -41,6 +41,9 @@ SELECT a.* FROM sys_depart_interface_info a WHERE a.interface_type = 'networkFreight' and a.sys_org_code = #{sysOrgCode} + and a.top_organization_id = #{sysDepartInterfaceInfoDo.topOrganizationId}