qilincloud168/ERPTurbo_Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(company): 公司信息字段结构调整

Browse Source 
- 将公司名称拆分为公司简称和公司全称两个字段
- 新增公司logo字段用于存储公司标识
- 更新数据库表字段映射关系
- 调整查询条件以支持新字段搜索
- 修改相关实体类和数据传输对象结构
- 更新Mapper配置以适配新的字段映射
This commit is contained in:
shenyifei 2025-11-09 16:48:42 +08:00
parent bc2c269e17
commit aa4620b30b
10 changed files with 92 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/domain/entity/Company.java
View File

@ -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;
/**
* 税号

18
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/CompanyDO.java
View File

@ -23,10 +23,22 @@ public class CompanyDO extends BaseDO<CompanyDO> {
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;
/**
* 税号

12
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/entity/OrderCompanyDO.java
View File

@ -37,10 +37,16 @@ public class OrderCompanyDO extends BaseDO<OrderCompanyDO> {
private Long companyId;
/**
* 公司名称
* 公司简称
*/
@TableField(value = "name")
private String name;
@TableField(value = "short_name")
private String shortName;
/**
* 公司全称
*/
@TableField(value = "full_name")
private String fullName;
/**
* 税号

3
erp-turbo-business/erp-turbo-biz/src/main/java/com/xunhong/erp/turbo/biz/infrastructure/gateway/CompanyGatewayImpl.java
View File

@ -42,7 +42,8 @@ public class CompanyGatewayImpl implements CompanyGateway {
@Override
public IPage<Company> page(CompanyPageQry companyPageQry) {
LambdaQueryWrapper<CompanyDO> 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());

4
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/CompanyMapper.xml
View File

@ -6,7 +6,9 @@
<resultMap id="BaseResultMap"
type="com.xunhong.erp.turbo.biz.infrastructure.entity.CompanyDO">
<result property="companyId" column="company_id"/>
<result property="name" column="name"/>
<result property="shortName" column="short_name"/>
<result property="fullName" column="full_name"/>
<result property="logo" column="logo"/>
<result property="taxNumber" column="tax_number"/>
<result property="contactPerson" column="contact_person"/>
<result property="contactPhone" column="contact_phone"/>

3
erp-turbo-business/erp-turbo-biz/src/main/resources/mapper/OrderCompanyMapper.xml
View File

@ -8,7 +8,8 @@
<result property="orderCompanyId" column="order_company_id"/>
<result property="orderId" column="order_id"/>
<result property="companyId" column="company_id"/>
<result property="name" column="name"/>
<result property="shortName" column="short_name"/>
<result property="fullName" column="full_name"/>
<result property="taxNumber" column="tax_number"/>
<result property="contactPerson" column="contact_person"/>
<result property="contactPhone" column="contact_phone"/>

18
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/cmd/CompanyCreateCmd.java
View File

@ -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;
/**
* 税号

18
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/common/OrderCompany.java
View File

@ -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;
}

8
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/qry/CompanyPageQry.java
View File

@ -20,7 +20,13 @@ public class CompanyPageQry extends PageQuery {
* 公司名称
*/
@Schema(title = "公司名称")
private String name;
private String shortName;
/**
* 公司全称
*/
@Schema(title = "公司全称")
private String fullName;
/**
* 税号

18
erp-turbo-common/erp-turbo-api/src/main/java/com/xunhong/erp/turbo/api/biz/dto/vo/CompanyVO.java
View File

@ -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;
/**
* 税号