From aa4620b30b79f2515b8391d13e46a2e19398cf80 Mon Sep 17 00:00:00 2001 From: shenyifei Date: Sun, 9 Nov 2025 16:48:42 +0800 Subject: [PATCH] =?UTF-8?q?feat(company):=20=E5=85=AC=E5=8F=B8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E5=AD=97=E6=AE=B5=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将公司名称拆分为公司简称和公司全称两个字段 - 新增公司logo字段用于存储公司标识 - 更新数据库表字段映射关系 - 调整查询条件以支持新字段搜索 - 修改相关实体类和数据传输对象结构 - 更新Mapper配置以适配新的字段映射 --- .../erp/turbo/biz/domain/entity/Company.java | 14 ++++++++++++-- .../biz/infrastructure/entity/CompanyDO.java | 18 +++++++++++++++--- .../infrastructure/entity/OrderCompanyDO.java | 12 +++++++++--- .../gateway/CompanyGatewayImpl.java | 3 ++- .../main/resources/mapper/CompanyMapper.xml | 4 +++- .../resources/mapper/OrderCompanyMapper.xml | 3 ++- .../api/biz/dto/cmd/CompanyCreateCmd.java | 18 +++++++++++++++--- .../turbo/api/biz/dto/common/OrderCompany.java | 18 ++++++++++++------ .../turbo/api/biz/dto/qry/CompanyPageQry.java | 8 +++++++- .../erp/turbo/api/biz/dto/vo/CompanyVO.java | 18 +++++++++++++++--- 10 files changed, 92 insertions(+), 24 deletions(-) diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Company.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Company.java index b1aacdc..caf7b09 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Company.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Company.java @@ -21,9 +21,19 @@ public class Company extends DTO { private Long companyId; /** - * 公司名称 + * 公司logo */ - private String name; + private String logo; + + /** + * 公司简称 + */ + private String shortName; + + /** + * 公司全称 + */ + private String fullName; /** * 税号 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CompanyDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CompanyDO.java index 6d32e05..ae398d8 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CompanyDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CompanyDO.java @@ -23,10 +23,22 @@ public class CompanyDO extends BaseDO { private Long companyId; /** - * 公司名称 + * 公司Logo */ - @TableField(value = "name") - private String name; + @TableField(value = "logo") + private String logo; + + /** + * 公司简称 + */ + @TableField(value = "short_name") + private String shortName; + + /** + * 公司全称 + */ + @TableField(value = "full_name") + private String fullName; /** * 税号 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCompanyDO.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCompanyDO.java index 0ea07b0..c65aa2c 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCompanyDO.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCompanyDO.java @@ -37,10 +37,16 @@ public class OrderCompanyDO extends BaseDO { private Long companyId; /** - * 公司名称 + * 公司简称 */ - @TableField(value = "name") - private String name; + @TableField(value = "short_name") + private String shortName; + + /** + * 公司全称 + */ + @TableField(value = "full_name") + private String fullName; /** * 税号 diff --git a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java index d54dd9b..8444ff5 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java +++ b/erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java @@ -42,7 +42,8 @@ public class CompanyGatewayImpl implements CompanyGateway { @Override public IPage page(CompanyPageQry companyPageQry) { LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(CompanyDO.class); - queryWrapper.like(StrUtil.isNotBlank(companyPageQry.getName()), CompanyDO::getName, companyPageQry.getName()); + queryWrapper.like(StrUtil.isNotBlank(companyPageQry.getShortName()), CompanyDO::getShortName, companyPageQry.getShortName()); + queryWrapper.like(StrUtil.isNotBlank(companyPageQry.getFullName()), CompanyDO::getFullName, companyPageQry.getFullName()); queryWrapper.like(StrUtil.isNotBlank(companyPageQry.getTaxNumber()), CompanyDO::getTaxNumber, companyPageQry.getTaxNumber()); queryWrapper.like(StrUtil.isNotBlank(companyPageQry.getRemark()), CompanyDO::getRemark, companyPageQry.getRemark()); queryWrapper.eq(Objects.nonNull(companyPageQry.getStatus()), CompanyDO::getStatus, companyPageQry.getStatus()); diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CompanyMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CompanyMapper.xml index 5ce5485..f4d3eff 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CompanyMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CompanyMapper.xml @@ -6,7 +6,9 @@ - + + + diff --git a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCompanyMapper.xml b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCompanyMapper.xml index 1e46ad2..89b9711 100644 --- a/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCompanyMapper.xml +++ b/erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCompanyMapper.xml @@ -8,7 +8,8 @@ - + + diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/CompanyCreateCmd.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/CompanyCreateCmd.java index 41ebaee..7f3ceec 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/CompanyCreateCmd.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/CompanyCreateCmd.java @@ -20,10 +20,22 @@ public class CompanyCreateCmd extends Command { private Long companyId; /** - * 公司名称 + * 公司logo */ - @Schema(title = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; + @Schema(title = "公司logo") + private String logo; + + /** + * 公司简称 + */ + @Schema(title = "公司简称", requiredMode = Schema.RequiredMode.REQUIRED) + private String shortName; + + /** + * 公司全称 + */ + @Schema(title = "公司全称", requiredMode = Schema.RequiredMode.REQUIRED) + private String fullName; /** * 税号 diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderCompany.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderCompany.java index e2f5452..18e93ed 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderCompany.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderCompany.java @@ -32,10 +32,16 @@ public class OrderCompany extends Command { private Long companyId; /** - * 公司名称 + * 公司简称 */ - @Schema(title = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; + @Schema(title = "公司简称", requiredMode = Schema.RequiredMode.REQUIRED) + private String shortName; + + /** + * 公司全称 + */ + @Schema(title = "公司全称", requiredMode = Schema.RequiredMode.REQUIRED) + private String fullName; /** * 税号 @@ -64,7 +70,7 @@ public class OrderCompany extends Command { /** * 账户ID */ - @Schema(title = "账户ID", type = "string", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "账户ID", type = "string") private Long accountId; /** @@ -82,13 +88,13 @@ public class OrderCompany extends Command { /** * 账户名称 */ - @Schema(title = "账户名称", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "账户名称") private String accountName; /** * 银行账号 */ - @Schema(title = "银行账号", requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(title = "银行账号") private String accountNumber; } diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/CompanyPageQry.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/CompanyPageQry.java index 243d822..5ed5155 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/CompanyPageQry.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/CompanyPageQry.java @@ -20,7 +20,13 @@ public class CompanyPageQry extends PageQuery { * 公司名称 */ @Schema(title = "公司名称") - private String name; + private String shortName; + + /** + * 公司全称 + */ + @Schema(title = "公司全称") + private String fullName; /** * 税号 diff --git a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/CompanyVO.java b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/CompanyVO.java index bd65075..6375c30 100644 --- a/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/CompanyVO.java +++ b/erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/CompanyVO.java @@ -22,10 +22,22 @@ public class CompanyVO extends DTO { private Long companyId; /** - * 公司名称 + * 公司logo */ - @Schema(title = "公司名称", requiredMode = Schema.RequiredMode.REQUIRED) - private String name; + @Schema(title = "公司logo", requiredMode = Schema.RequiredMode.REQUIRED) + private String logo; + + /** + * 公司简称 + */ + @Schema(title = "公司简称", requiredMode = Schema.RequiredMode.REQUIRED) + private String shortName; + + /** + * 公司全称 + */ + @Schema(title = "公司全称", requiredMode = Schema.RequiredMode.REQUIRED) + private String fullName; /** * 税号