From b3b8cdede315ad5b843fa8418024a78cb6bfc9bf Mon Sep 17 00:00:00 2001 From: nmy <849173236@qq.com> Date: Sat, 9 Dec 2023 14:47:01 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=B3=A8?= =?UTF-8?q?=E5=86=8C=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../company/api/domain/BmCompanyInfo.java | 8 +++++ .../company/api/domain/vo/BmCompanyVo.java | 4 ++- .../zlpt/company/mapper/BmCoBankMapper.java | 4 ++- .../impl/BmCompanyInfoServiceImpl.java | 2 +- .../resources/mapper/BmCompanyInfoMapper.xml | 32 ++++++++++++++++--- 5 files changed, 42 insertions(+), 8 deletions(-) diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java index 6dbaa54..3dca138 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/BmCompanyInfo.java @@ -58,6 +58,14 @@ public class BmCompanyInfo implements Serializable { @ApiModelProperty(value = "统一社会信用代码", required = true) private String creditCode; + @Excel(name = "注册地址") + @ApiModelProperty(value = "注册地址", required = true) + private String registerId; + + @Excel(name = "经营地址") + @ApiModelProperty(value = "经营地址", required = true) + private String operateId; + /** * 注册地址 */ diff --git a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java index 627ec84..a7d00b9 100644 --- a/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java +++ b/zlpt-api/zlpt-api-company/src/main/java/com/bonus/zlpt/company/api/domain/vo/BmCompanyVo.java @@ -5,6 +5,8 @@ import com.bonus.zlpt.company.api.domain.BmCoBank; import com.bonus.zlpt.company.api.domain.BmCompanyInfo; import lombok.Data; +import java.util.List; + @Data public class BmCompanyVo { @@ -12,7 +14,7 @@ public class BmCompanyVo { private BmCompanyInfo bmCompanyInfo; //企业开户行信息 - private BmCoBank bmCoBank; + private List bmCoBank; } diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BmCoBankMapper.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BmCoBankMapper.java index 08cc46c..5ce9bf8 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BmCoBankMapper.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/mapper/BmCoBankMapper.java @@ -3,6 +3,8 @@ package com.bonus.zlpt.company.mapper; import com.bonus.zlpt.company.api.domain.BmCoBank; import org.apache.ibatis.annotations.Mapper; +import java.util.List; + /** * Description: * @Author 阮世耀 @@ -59,5 +61,5 @@ public interface BmCoBankMapper { * @param companyId * @return */ - BmCoBank selectByCompanyId(Integer companyId); + List selectByCompanyId(Integer companyId); } \ No newline at end of file diff --git a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java index c3de65f..e92bca6 100644 --- a/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java +++ b/zlpt-modules/zlpt-company/src/main/java/com/bonus/zlpt/company/service/impl/BmCompanyInfoServiceImpl.java @@ -91,7 +91,7 @@ public class BmCompanyInfoServiceImpl implements BmCompanyInfoService { List bmCompanyInfos = bmCompanyInfoMapper.selectList(bmCompanyDto); for (BmCompanyInfo bmCompanyInfo : bmCompanyInfos) { - SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getAuditor().longValue()).getData(); + SysUser data = remoteUserService.selectUserById(bmCompanyInfo.getCreator().longValue()).getData(); bmCompanyInfo.setUserName(data.getUserName()); } return bmCompanyInfos; diff --git a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml index ceef7a8..5403439 100644 --- a/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml +++ b/zlpt-modules/zlpt-company/src/main/resources/mapper/BmCompanyInfoMapper.xml @@ -9,6 +9,8 @@ + + @@ -39,7 +41,7 @@ - company_id, company_name, company_type, company_ltd, credit_code, register_address, + company_id, company_name, company_type, company_ltd, credit_code,register_id,operate_id, register_address, operate_address, certificateType, id_number, business_license, legal_person, invitation_code, invitation_co_name, business_scope, auth_person, auth_id_number, auth_phone, auth_document, id_face_url, id_nation_url, auth_email,create_time, creator, auditor, audit_time, audit_remark, @@ -61,7 +63,7 @@ insert into bm_company_info (company_name, company_type, company_ltd, - credit_code, register_address, operate_address, + credit_code,register_id,operate_id, register_address, operate_address, certificateType, id_number, business_license, legal_person, invitation_code, invitation_co_name, business_scope, auth_person, auth_id_number, @@ -70,7 +72,7 @@ auditor, audit_time, audit_remark, `status`,logo_url update_time,legal_face_url,legal_nation_url) values (#{companyName,jdbcType=VARCHAR}, #{companyType,jdbcType=VARCHAR}, #{companyLtd,jdbcType=VARCHAR}, - #{creditCode,jdbcType=VARCHAR}, #{registerAddress,jdbcType=VARCHAR}, #{operateAddress,jdbcType=VARCHAR}, + #{creditCode,jdbcType=VARCHAR},#{registerId,jdbcType=VARCHAR},#{operateId,jdbcType=VARCHAR}, #{registerAddress,jdbcType=VARCHAR}, #{operateAddress,jdbcType=VARCHAR}, #{certificatetype,jdbcType=VARCHAR}, #{idNumber,jdbcType=VARCHAR}, #{businessLicense,jdbcType=VARCHAR}, #{legalPerson,jdbcType=VARCHAR}, #{invitationCode,jdbcType=VARCHAR}, #{invitationCoName,jdbcType=VARCHAR}, #{businessScope,jdbcType=VARCHAR}, #{authPerson,jdbcType=VARCHAR}, #{authIdNumber,jdbcType=VARCHAR}, @@ -96,6 +98,12 @@ credit_code, + + register_id, + + + operate_id, + register_address, @@ -188,6 +196,12 @@ #{creditCode,jdbcType=VARCHAR}, + + #{registerId,jdbcType=VARCHAR}, + + + #{operateId,jdbcType=VARCHAR}, + #{registerAddress,jdbcType=VARCHAR}, @@ -285,6 +299,12 @@ credit_code = #{creditCode,jdbcType=VARCHAR}, + + register_id = #{registerId,jdbcType=VARCHAR}, + + + operate_id = #{operateId,jdbcType=VARCHAR}, + register_address = #{registerAddress,jdbcType=VARCHAR}, @@ -374,6 +394,8 @@ company_type = #{companyType,jdbcType=VARCHAR}, company_ltd = #{companyLtd,jdbcType=VARCHAR}, credit_code = #{creditCode,jdbcType=VARCHAR}, + register_id = #{registerId,jdbcType=VARCHAR}, + operate_id = #{operateId,jdbcType=VARCHAR}, register_address = #{registerAddress,jdbcType=VARCHAR}, operate_address = #{operateAddress,jdbcType=VARCHAR}, certificateType = #{certificatetype,jdbcType=VARCHAR}, @@ -417,7 +439,7 @@