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

refactor: 重构供应商文件类型枚举及相关服务

Browse Source 
feat: 为多个服务添加缓存支持
fix: 修复WebSocket任务管理和远程调用异常处理
refactor: 重命名CompanyVendorFileType为VendorFileType
refactor: 优化项目成本导入任务实现
fix: 修复ContractTabSkinBase中的空指针问题
refactor: 统一WebSocket客户端任务调用接口
This commit is contained in:
宋其青
2025-09-17 22:28:17 +08:00
parent 7560250036
commit c0e4916474
43 changed files with 624 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,12 +1,19 @@
package com.ecep.contract;
public enum CompanyVendorFileType {
/**
* 枚举类 VendorFileType，用于表示不同类型的供应商文件
* 该枚举定义了两种文件类型：普通文件和评价表
*/
public enum VendorFileType {
/**
* 普通文件，一般文件
* 表示常规的供应商文件类型，不包含特殊用途或格式
*/
General,
/**
* 评价表; 评估表
* 用于供应商评估或评价的特定表格文件
* 包含对供应商各方面表现的评估指标和内容
*/
EvaluationForm;
}

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

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

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

@@ -3,7 +3,7 @@ package com.ecep.contract.model;
import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.CompanyVendorFileType;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.util.HibernateProxyUtils;
import jakarta.persistence.Entity;
@@ -20,7 +20,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR_FILE_TYPE_LOCAL")
@ToString
public class CompanyVendorFileTypeLocal extends BaseEnumEntity<CompanyVendorFileType> implements Serializable {
public class VendorFileTypeLocal extends BaseEnumEntity<VendorFileType> implements Serializable {
private static final long serialVersionUID = 1L;
@Override
public final boolean equals(Object object) {
@@ -31,7 +31,7 @@ public class CompanyVendorFileTypeLocal extends BaseEnumEntity<CompanyVendorFile
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
return false;
}
CompanyVendorFileTypeLocal that = (CompanyVendorFileTypeLocal) object;
VendorFileTypeLocal that = (VendorFileTypeLocal) object;
return getId() != null && Objects.equals(getId(), that.getId());
}