tms3.10修改

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

mhd_finance/src/main/resources/mapper/receivingAccount/ReceivingAccountMapper.xml

@@ -16,7 +16,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectReceivingAccountPo">
-        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
     </sql>
 
@@ -70,7 +70,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <insert id="batchInsert" parameterType="java.util.List">
-        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
         <foreach collection="list" item="item" separator=",">
             (
@@ -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}
             )
         </foreach>
     </insert>

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;
 
 
 }

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;
 }
 

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;
 }

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<String> idKeyList;

mhd_thrid_party/src/main/java/com/linke/thirdParty/domain/departInterfaceInfo/repository/mapper/SysDepartInterfaceInfoMapper.java

@@ -61,4 +61,6 @@ public interface SysDepartInterfaceInfoMapper extends BaseMapper<SysDepartInterf
     int saveOrUpdate(@Param(value = "sysDepartInterfaceInfoVO") SysDepartInterfaceInfoPo sysDepartInterfaceInfoPo);
 	@Select("SELECT * FROM sys_depart_interface_info WHERE interface_type_key = #{isAllowedTon} ")
     SysDepartInterfaceInfo queryListByInter(@Param("isAllowedTon") String isAllowedTon);
+
+    String selectOrgNameById(Long organizationId);
 }

mhd_thrid_party/src/main/java/com/linke/thirdParty/interfaces/facade/SysDepartInterfaceInfoApi.java

@@ -4,6 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.linke.thirdParty.application.server.SysDepartInterfaceInfoApplicationService;
+import com.linke.thirdParty.domain.departInterfaceInfo.repository.facade.ISysDepartInterfaceInfoInterface;
+import com.linke.thirdParty.domain.departInterfaceInfo.repository.mapper.SysDepartInterfaceInfoMapper;
 import com.mhd.common.core.constant.CacheConstants;
 import com.mhd.common.core.domain.entity.OrgProductConfig;
 import com.mhd.common.core.domain.po.thirdparty.SysDepartInterfaceInfoPo;
@@ -35,6 +37,8 @@ public class SysDepartInterfaceInfoApi extends BaseController
 {
    @Autowired
    private SysDepartInterfaceInfoApplicationService sysDepartInterfaceInfoApplicationService;
+   @Autowired
+   private SysDepartInterfaceInfoMapper sysDepartInterfaceInfoMapper;
 
    /**
     * 分页列表查询(根据一级组织查询)
@@ -48,6 +52,12 @@ public class SysDepartInterfaceInfoApi extends BaseController
        BeanUtils.copyProperties(sysDepartInterfaceInfoDTO,sysDepartInterfaceInfoDo);
        startPage();
        List<SysDepartInterfaceInfoPo> list = sysDepartInterfaceInfoApplicationService.queryList(sysDepartInterfaceInfoDo);
+       for (SysDepartInterfaceInfoPo sysDepartInterfaceInfo : list) {
+           String s = sysDepartInterfaceInfoMapper.selectOrgNameById(sysDepartInterfaceInfo.getOrganizationId());
+           if(StrUtil.isNotBlank(s))
+           sysDepartInterfaceInfo.setOrganizationName(s);
+
+       }
        return getDataTable(list);
    }
 

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}
     </select>
+    <select id="selectOrgNameById" resultType="java.lang.String">
+        select organization_name from NGWL_TEST_PRODUCT.SYS_ORGANIZATION where organization_id = #{organizationId}
+    </select>
     <sql id="common_where">
         <if test="sysDepartInterfaceInfoDo.topOrganizationId !=null">
             and a.top_organization_id = #{sysDepartInterfaceInfoDo.topOrganizationId}