From f40010433d07b1ff7d49d338770609d33640b477 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com> Date: Thu, 22 Jan 2026 08:51:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(credit):=20=E6=B7=BB=E5=8A=A0=E4=B8=BB?= =?UTF-8?q?=E4=BD=93=E4=BC=81=E4=B8=9A=E5=90=8D=E7=A7=B0=E5=85=B3=E8=81=94?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在多个实体类中添加companyName字段用于显示主体企业名称 - 修改XML映射文件实现与credit_company表的左连接查询 - 将企业名称作为companyName字段返回到查询结果中 - 修复CreditBranch实体类中字段描述的一致性问题 - 更新CreditNearbyCompany的关键词搜索逻辑以支持企业名称搜索 --- .../gxwebsoft/credit/entity/CreditAdministrativeLicense.java | 4 ++++ .../java/com/gxwebsoft/credit/entity/CreditBankruptcy.java | 4 ++++ src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java | 4 ++++ .../gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java | 4 ++++ .../java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java | 4 ++++ src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java | 4 ++++ .../gxwebsoft/credit/entity/CreditSuspectedRelationship.java | 4 ++++ .../credit/mapper/xml/CreditAdministrativeLicenseMapper.xml | 2 +- .../gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml | 3 ++- .../com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml | 2 +- .../credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml | 2 +- .../gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml | 4 ++-- .../com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml | 2 +- .../credit/mapper/xml/CreditSuspectedRelationshipMapper.xml | 2 +- 14 files changed, 37 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java b/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java index 4c67b28..a678f69 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditAdministrativeLicense.java @@ -65,6 +65,10 @@ public class CreditAdministrativeLicense implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主体企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "是否推荐") private Integer recommend; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java b/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java index 150eb5c..6741676 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditBankruptcy.java @@ -52,6 +52,10 @@ public class CreditBankruptcy implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主体企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "是否推荐") private Integer recommend; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java b/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java index 649a281..aba42b6 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditBranch.java @@ -52,6 +52,10 @@ public class CreditBranch implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主题企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "是否推荐") private Integer recommend; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java b/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java index b8c6431..1ea23db 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditHistoricalLegalPerson.java @@ -46,6 +46,10 @@ public class CreditHistoricalLegalPerson implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主体企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "是否推荐") private Integer recommend; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java index 8db323b..c7cd714 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditNearbyCompany.java @@ -79,6 +79,10 @@ public class CreditNearbyCompany implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主体企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "纳税人识别号") private String taxpayerCode; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java b/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java index b432792..6634e22 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditPatent.java @@ -64,6 +64,10 @@ public class CreditPatent implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主体企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "是否推荐") private Integer recommend; diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java b/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java index b041204..f41659b 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditSuspectedRelationship.java @@ -61,6 +61,10 @@ public class CreditSuspectedRelationship implements Serializable { @Schema(description = "企业ID") private Integer companyId; + @Schema(description = "主体企业") + @TableField(exist = false) + private String companyName; + @Schema(description = "是否推荐") private Integer recommend; diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml index 460014e..fc926d1 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditAdministrativeLicenseMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*, b.name AS companyName, u.real_name AS realName FROM credit_administrative_license a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml index 4d87283..4d8770a 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBankruptcyMapper.xml @@ -4,8 +4,9 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*, b.name AS companyName, u.real_name AS realName FROM credit_bankruptcy a + LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml index 5cff6b6..4f3a11c 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditBranchMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*, b.name AS companyName, u.real_name AS realName FROM credit_branch a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml index 0b700cb..12ac7f3 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditHistoricalLegalPersonMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*, b.name AS companyName, u.real_name AS realName FROM credit_historical_legal_person a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml index d8f9327..c461f3e 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditNearbyCompanyMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*,b.name AS companyName, u.real_name AS realName FROM credit_nearby_company a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id @@ -204,7 +204,7 @@ AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') OR a.name = #{param.keywords} - OR b.name LIKE CONCAT('%', #{param.keywords}, '%') + OR b.name LIKE CONCAT('%', #{param.keywords}, '%') ) diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml index dc9b6f4..bbd4087 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditPatentMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*, b.name AS companyName, u.real_name AS realName FROM credit_patent a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml index 7f3a3f7..8cc7426 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSuspectedRelationshipMapper.xml @@ -4,7 +4,7 @@ - SELECT a.*, u.real_name AS realName + SELECT a.*, b.name AS companyName, u.real_name AS realName FROM credit_suspected_relationship a LEFT JOIN credit_company b ON a.company_id = b.id LEFT JOIN gxwebsoft_core.sys_user u ON a.user_id = u.user_id