From b1cd1cff7e4e9a7521bd3352fc6637956c9392bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Tue, 3 Mar 2026 16:32:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor(credit):=20=E9=87=8D=E6=9E=84=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E5=AE=9A=E4=B9=89?= =?UTF-8?q?=E5=92=8C=E5=AF=BC=E5=85=A5=E5=8F=82=E6=95=B0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将mailingEmail字段描述从"通信地址邮箱"更正为"通信地址邮编" - 移除CreditNearbyCompany实体中多个冗余字段的数据库映射注解 - 在控制器中移除实缴资本等字段的赋值逻辑 - 更新导入参数类中对应字段的Excel名称标注 - 添加更多联系方式字段的支持 --- .../CreditNearbyCompanyController.java | 12 +--- .../credit/entity/CreditNearbyCompany.java | 70 +++++++++++-------- .../param/CreditNearbyCompanyImportParam.java | 2 +- 3 files changed, 43 insertions(+), 41 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java index a3a8a06..b77f908 100644 --- a/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java +++ b/src/main/java/com/gxwebsoft/credit/controller/CreditNearbyCompanyController.java @@ -418,7 +418,6 @@ public class CreditNearbyCompanyController extends BaseController { entity.setRegistrationStatus(param.getRegistrationStatus()); entity.setLegalPerson(param.getLegalPerson()); entity.setRegisteredCapital(param.getRegisteredCapital()); - entity.setPaidinCapital(param.getPaidinCapital()); entity.setEstablishDate(param.getEstablishDate()); entity.setCode(param.getCode()); entity.setAddress(param.getAddress()); @@ -451,18 +450,11 @@ public class CreditNearbyCompanyController extends BaseController { entity.setType(param.getType()); entity.setInstitutionType(param.getInstitutionType()); entity.setCompanySize(param.getCompanySize()); - entity.setRegistrationAuthority(param.getRegistrationAuthority()); - entity.setTaxpayerQualification(param.getTaxpayerQualification()); - entity.setLatestAnnualReportYear(param.getLatestAnnualReportYear()); - entity.setLatestAnnualReportOnOperatingRevenue(param.getLatestAnnualReportOnOperatingRevenue()); - entity.setEnterpriseScoreCheck(param.getEnterpriseScoreCheck()); - entity.setCreditRating(param.getCreditRating()); - entity.setCechnologyScore(param.getCechnologyScore()); - entity.setCechnologyLevel(param.getCechnologyLevel()); - entity.setSmallEnterprise(param.getSmallEnterprise()); entity.setCompanyProfile(param.getCompanyProfile()); entity.setNatureOfBusiness(param.getNatureOfBusiness()); entity.setComments(param.getComments()); + entity.setMoreEmail(param.getMoreEmail()); + entity.setMoreTel(param.getMoreTel()); return entity; } diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java index 0d37494..d32691d 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java @@ -131,7 +131,7 @@ public class CreditNearbyCompany implements Serializable { @Schema(description = "通信地址") private String mailingAddress; - @Schema(description = "通信地址邮箱") + @Schema(description = "通信地址邮编") private String mailingEmail; @Schema(description = "企业简介") @@ -164,35 +164,45 @@ public class CreditNearbyCompany implements Serializable { @Schema(description = "上级id, 0是顶级") private Integer parentId; - @Schema(description = "实缴资本") - private String paidinCapital; - - @Schema(description = "登记机关") - private String registrationAuthority; - - @Schema(description = "纳税人资质") - private String taxpayerQualification; - - @Schema(description = "最新年报年份") - private String latestAnnualReportYear; - - @Schema(description = "最新年报营业收入") - private String latestAnnualReportOnOperatingRevenue; - - @Schema(description = "企查分") - private String enterpriseScoreCheck; - - @Schema(description = "信用等级") - private String creditRating; - - @Schema(description = "科创分") - private String cechnologyScore; - - @Schema(description = "科创等级") - private String cechnologyLevel; - - @Schema(description = "是否小微企业") - private String smallEnterprise; +// @Schema(description = "实缴资本") +// @TableField(exist = false) +// private String paidinCapital; +// +// @Schema(description = "登记机关") +// @TableField(exist = false) +// private String registrationAuthority; +// +// @Schema(description = "纳税人资质") +// @TableField(exist = false) +// private String taxpayerQualification; +// +// @Schema(description = "最新年报年份") +// @TableField(exist = false) +// private String latestAnnualReportYear; +// +// @Schema(description = "最新年报营业收入") +// @TableField(exist = false) +// private String latestAnnualReportOnOperatingRevenue; +// +// @Schema(description = "企查分") +// @TableField(exist = false) +// private String enterpriseScoreCheck; +// +// @Schema(description = "信用等级") +// @TableField(exist = false) +// private String creditRating; +// +// @Schema(description = "科创分") +// @TableField(exist = false) +// private String cechnologyScore; +// +// @Schema(description = "科创等级") +// @TableField(exist = false) +// private String cechnologyLevel; +// +// @Schema(description = "是否小微企业") +// @TableField(exist = false) +// private String smallEnterprise; @Schema(description = "是否有数据") private Boolean hasData; diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java index 4f50543..7d55a31 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditNearbyCompanyImportParam.java @@ -97,7 +97,7 @@ public class CreditNearbyCompanyImportParam implements Serializable { @Excel(name = "通信地址") private String mailingAddress; - @Excel(name = "通信地址邮箱") + @Excel(name = "通信地址邮编") private String mailingEmail; @Excel(name = "注册地址邮编")