refactor(contract): 重构客户文件类型相关代码,统一命名和继承结构
- 将 CompanyCustomerFileType 重命名为 CustomerFileType - 统一相关 VO 和 model 的继承结构,使用 BaseEnumEntity - 更新所有引用点,保持代码一致性 - 优化表格单元格显示逻辑,使用专用单元格工厂
This commit is contained in:
@@ -34,6 +34,5 @@ public abstract class BaseEnumEntity<T extends Enum<?>> implements IdentityEntit
|
||||
@Column(name = "VALUE")
|
||||
private String value;
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -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;
|
||||
|
||||
/**
|
||||
* 文件路径
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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);
|
||||
|
||||
Reference in New Issue
Block a user