fix(credit): 修复公司名称字段映射问题

- 移除实体类中的多余 TableField 注解
- 修改 SQL 查询逻辑,使用 match_name 字段替代原来的 company_name
- 统一多个信用相关实体的字段映射方式
- 添加新的生产环境配置文件 application-ysb2.yml
- 更新默认激活的环境配置为 ysb2
This commit is contained in:
2026-02-27 12:34:01 +08:00
parent f25e2c3707
commit 9b18851aaf
12 changed files with 107 additions and 11 deletions

View File

@@ -72,7 +72,6 @@ public class CreditAdministrativeLicense implements Serializable {
private Integer companyId;
@Schema(description = "主体企业")
@TableField("company_name")
private String companyName;
@Schema(description = "是否推荐")

View File

@@ -56,7 +56,6 @@ public class CreditBranch implements Serializable {
private Integer companyId;
@Schema(description = "主题企业")
@TableField("company_name")
private String companyName;
@Schema(description = "是否推荐")

View File

@@ -50,7 +50,6 @@ public class CreditHistoricalLegalPerson implements Serializable {
private Integer companyId;
@Schema(description = "主体企业")
@TableField("company_name")
private String companyName;
@Schema(description = "是否推荐")

View File

@@ -80,7 +80,6 @@ public class CreditNearbyCompany implements Serializable {
private Integer companyId;
@Schema(description = "主体企业")
@TableField("company_name")
private String companyName;
@Schema(description = "纳税人识别号")

View File

@@ -65,7 +65,6 @@ public class CreditSuspectedRelationship implements Serializable {
private Integer companyId;
@Schema(description = "主体企业")
@TableField("company_name")
private String companyName;
@Schema(description = "是否推荐")

View File

@@ -4,7 +4,7 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName
SELECT a.*, b.match_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

View File

@@ -4,7 +4,7 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName
SELECT a.*, COALESCE(match_name, a.company_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

View File

@@ -4,7 +4,7 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName
SELECT a.*, COALESCE(match_name, a.company_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

View File

@@ -4,7 +4,7 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName
SELECT a.*, COALESCE(match_name, a.company_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

View File

@@ -4,7 +4,7 @@
<!-- 关联查询sql -->
<sql id="selectSql">
SELECT a.*, COALESCE(b.name, a.company_name) AS companyName, u.real_name AS realName
SELECT a.*, COALESCE(match_name, a.company_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