songqq/contract-manager
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects 1 Releases 1 Wiki Activity

refactor(contract): 重构客户文件类型相关代码，统一命名和继承结构

Browse Source 
- 将 CompanyCustomerFileType 重命名为 CustomerFileType
- 统一相关 VO 和 model 的继承结构，使用 BaseEnumEntity
- 更新所有引用点，保持代码一致性
- 优化表格单元格显示逻辑，使用专用单元格工厂
This commit is contained in:
宋其青
2025-09-22 17:25:24 +08:00
parent 3c3003fdf3
commit 35a15f4702
33 changed files with 150 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/src/main/java/com/ecep/contract/CustomerFileType.java
View File

@@ -1,6 +1,6 @@
package com.ecep.contract;
public enum CompanyCustomerFileType {
public enum CustomerFileType {
/**
* 普通文件，一般文件
*/

1
common/src/main/java/com/ecep/contract/model/BaseEnumEntity.java
View File

@@ -34,6 +34,5 @@ public abstract class BaseEnumEntity<T extends Enum<?>> implements IdentityEntit
@Column(name = "VALUE")
private String value;
}

6
common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java
View File

@@ -4,7 +4,7 @@ import java.io.Serializable;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.CompanyCustomerFileType;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.util.HibernateProxyUtils;
import jakarta.persistence.Column;
@@ -27,7 +27,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_CUSTOMER_FILE")
@ToString
public class CompanyCustomerFile implements CompanyBasicFile<CompanyCustomerFileType>, Serializable {
public class CompanyCustomerFile implements CompanyBasicFile<CustomerFileType>, Serializable {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -41,7 +41,7 @@ public class CompanyCustomerFile implements CompanyBasicFile<CompanyCustomerFile
@Column(name = "TYPE")
@Enumerated(EnumType.STRING)
private CompanyCustomerFileType type;
private CustomerFileType type;
/**
* 文件路径

4
common/src/main/java/com/ecep/contract/model/CompanyCustomerFileTypeLocal.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.CompanyCustomerFileType;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.util.HibernateProxyUtils;
import jakarta.persistence.Entity;
@@ -17,7 +17,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_CUSTOMER_FILE_TYPE_LOCAL")
@ToString
public class CompanyCustomerFileTypeLocal extends BaseEnumEntity<CompanyCustomerFileType> implements Serializable {
public class CompanyCustomerFileTypeLocal extends BaseEnumEntity<CustomerFileType> implements Serializable {
private static final long serialVersionUID = 1L;
@Override

2
common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java
View File

@@ -55,7 +55,7 @@ public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> impl
public ContractFileTypeLocalVo toVo() {
ContractFileTypeLocalVo vo = new ContractFileTypeLocalVo();
vo.setId(getId());
vo.setLanguage(getLang());
vo.setLang(getLang());
vo.setType(getType());
vo.setDescription(getDescription());
vo.setSuggestFileName(suggestFileName);

4
common/src/main/java/com/ecep/contract/vo/CompanyCustomerFileVo.java
View File

@@ -1,7 +1,7 @@
package com.ecep.contract.vo;
import com.ecep.contract.model.IdentityEntity;
import com.ecep.contract.CompanyCustomerFileType;
import com.ecep.contract.CustomerFileType;
import java.time.LocalDate;
import lombok.Data;
@@ -9,7 +9,7 @@ import lombok.Data;
public class CompanyCustomerFileVo implements IdentityEntity {
private Integer id;
private Integer customer;
private CompanyCustomerFileType type;
private CustomerFileType type;
private String filePath;
private String editFilePath;
private LocalDate signDate;

8
common/src/main/java/com/ecep/contract/vo/CompanyFileTypeLocalVo.java
View File

@@ -1,14 +1,12 @@
package com.ecep.contract.vo;
import com.ecep.contract.CompanyFileType;
import com.ecep.contract.VendorType;
import com.ecep.contract.model.BaseEnumEntity;
import com.ecep.contract.model.IdentityEntity;
import lombok.Data;
@Data
public class CompanyFileTypeLocalVo implements IdentityEntity {
private Integer id;
private String name;
private CompanyFileType value;
private Integer orderNum = 0;
public class CompanyFileTypeLocalVo extends BaseEnumEntity<CompanyFileType> implements IdentityEntity {
private boolean active = false;
}

7
common/src/main/java/com/ecep/contract/vo/ContractFileTypeLocalVo.java
View File

@@ -1,14 +1,13 @@
package com.ecep.contract.vo;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.model.BaseEnumEntity;
import com.ecep.contract.model.IdentityEntity;
import com.ecep.contract.ContractFileType;
import lombok.Data;
@Data
public class ContractFileTypeLocalVo implements IdentityEntity {
private Integer id;
private String language;
private ContractFileType type;
public class ContractFileTypeLocalVo extends BaseEnumEntity<ContractFileType> implements IdentityEntity {
private String description;
private String suggestFileName;
}

7
common/src/main/java/com/ecep/contract/vo/CustomerFileTypeLocalVo.java
View File

@@ -1,14 +1,13 @@
package com.ecep.contract.vo;
import com.ecep.contract.CompanyCustomerFileType;
import com.ecep.contract.CompanyFileType;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.model.BaseEnumEntity;
import com.ecep.contract.model.IdentityEntity;
import lombok.Data;
@Data
public class CompanyCustomerFileTypeLocalVo
extends BaseEnumEntity<CompanyCustomerFileType>
public class CustomerFileTypeLocalVo
extends BaseEnumEntity<CustomerFileType>
implements IdentityEntity {
private Integer orderNum = 0;
private boolean active = false;

9
common/src/main/java/com/ecep/contract/vo/VendorFileTypeLocalVo.java
View File

@@ -1,4 +1,11 @@
package com.ecep.contract.vo;
public class VendorFileTypeLocalVo {
import com.ecep.contract.VendorFileType;
import com.ecep.contract.model.BaseEnumEntity;
import com.ecep.contract.model.IdentityEntity;
import lombok.Data;
@Data
public class VendorFileTypeLocalVo extends BaseEnumEntity<VendorFileType>
implements IdentityEntity {
}

9
common/src/main/java/com/ecep/contract/vo/VendorTypeLocalVo.java
View File

@@ -1,14 +1,11 @@
package com.ecep.contract.vo;
import com.ecep.contract.model.BaseEnumEntity;
import com.ecep.contract.model.IdentityEntity;
import com.ecep.contract.VendorType;
import lombok.Data;
@Data
public class VendorTypeLocalVo implements IdentityEntity {
private Integer id;
private String language;
private VendorType type;
private String name;
private String description;
public class VendorTypeLocalVo extends BaseEnumEntity<VendorType> implements IdentityEntity {
}