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

refactor(vendor): 重构供应商相关类命名和包结构

Browse Source 
将CompanyVendor前缀的类重命名为Vendor前缀，优化包结构
调整供应商相关控制器、服务、仓库类的命名和位置
修复TableViewUtils中的类型安全警告
更新FXML文件中的控制器引用路径
This commit is contained in:
宋其青
2025-09-23 23:37:44 +08:00
parent 9c3306eea3
commit 9561ad99e6
124 changed files with 613 additions and 520 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
common/src/main/java/com/ecep/contract/model/Vendor.java
View File

@@ -10,7 +10,7 @@ import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.VendorType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
@@ -34,7 +34,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR", schema = "supplier_ms")
@ToString
public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable<CompanyVendorVo> {
public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable<VendorVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -58,7 +58,7 @@ public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable,
@OneToMany(mappedBy = "vendor", fetch = FetchType.LAZY)
@JsonIgnore
@ToString.Exclude
private List<CompanyVendorEntity> entities;
private List<VendorEntity> entities;
@ManyToOne
@JoinColumn(name = "VEN_CLS")
@@ -124,8 +124,8 @@ public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable,
}
@Override
public CompanyVendorVo toVo() {
CompanyVendorVo vo = new CompanyVendorVo();
public VendorVo toVo() {
VendorVo vo = new VendorVo();
vo.setId(id);
vo.setType(type);
vo.setProtocolProvider(protocolProvider);

10
common/src/main/java/com/ecep/contract/model/VendorApproved.java
View File

@@ -5,7 +5,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorApprovedListVo;
import com.ecep.contract.vo.VendorApprovedVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +27,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR_APPROVED")
@ToString
public class VendorApprovedList implements IdentityEntity, Serializable, Voable<CompanyVendorApprovedListVo> {
public class VendorApproved implements IdentityEntity, Serializable, Voable<VendorApprovedVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -67,7 +67,7 @@ public class VendorApprovedList implements IdentityEntity, Serializable, Voable<
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
return false;
}
VendorApprovedList that = (VendorApprovedList) object;
VendorApproved that = (VendorApproved) object;
return getId() != null && Objects.equals(getId(), that.getId());
}
@@ -77,8 +77,8 @@ public class VendorApprovedList implements IdentityEntity, Serializable, Voable<
}
@Override
public CompanyVendorApprovedListVo toVo() {
CompanyVendorApprovedListVo vo = new CompanyVendorApprovedListVo();
public VendorApprovedVo toVo() {
VendorApprovedVo vo = new VendorApprovedVo();
vo.setId(getId());
vo.setTitle(getTitle());
vo.setPublishDate(getPublishDate());

12
common/src/main/java/com/ecep/contract/model/VendorApprovedFile.java
View File

@@ -5,7 +5,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorApprovedFileVo;
import com.ecep.contract.vo.VendorApprovedFileVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -28,7 +28,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR_APPROVED_FILE")
@ToString
public class CompanyVendorApprovedFile implements IdentityEntity, Serializable, Voable<CompanyVendorApprovedFileVo> {
public class VendorApprovedFile implements IdentityEntity, Serializable, Voable<VendorApprovedFileVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -38,7 +38,7 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable,
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "LIST_ID", nullable = false)
@ToString.Exclude
private VendorApprovedList list;
private VendorApproved list;
/**
* 文件名，不含目录，目录使用目录的目录
@@ -67,7 +67,7 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable,
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
return false;
}
CompanyVendorApprovedFile that = (CompanyVendorApprovedFile) object;
VendorApprovedFile that = (VendorApprovedFile) object;
return getId() != null && Objects.equals(getId(), that.getId());
}
@@ -77,8 +77,8 @@ public class CompanyVendorApprovedFile implements IdentityEntity, Serializable,
}
@Override
public CompanyVendorApprovedFileVo toVo() {
CompanyVendorApprovedFileVo vo = new CompanyVendorApprovedFileVo();
public VendorApprovedFileVo toVo() {
VendorApprovedFileVo vo = new VendorApprovedFileVo();
vo.setId(getId());
vo.setListId(getList() != null ? getList().getId() : null);
vo.setFileName(getFileName());

12
common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java
View File

@@ -5,7 +5,7 @@ import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorApprovedItemVo;
import com.ecep.contract.vo.VendorApprovedItemVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -28,7 +28,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR_APPROVED_ITEM")
@ToString
public class CompanyVendorApprovedItem implements IdentityEntity, Serializable, Voable<CompanyVendorApprovedItemVo> {
public class VendorApprovedItem implements IdentityEntity, Serializable, Voable<VendorApprovedItemVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -39,7 +39,7 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable,
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "LIST_ID", nullable = false)
@ToString.Exclude
private VendorApprovedList list;
private VendorApproved list;
/**
* 供应商名称，有可能改名了，所以存历史名称
@@ -73,7 +73,7 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable,
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
return false;
}
CompanyVendorApprovedItem that = (CompanyVendorApprovedItem) object;
VendorApprovedItem that = (VendorApprovedItem) object;
return getId() != null && Objects.equals(getId(), that.getId());
}
@@ -83,8 +83,8 @@ public class CompanyVendorApprovedItem implements IdentityEntity, Serializable,
}
@Override
public CompanyVendorApprovedItemVo toVo() {
CompanyVendorApprovedItemVo vo = new CompanyVendorApprovedItemVo();
public VendorApprovedItemVo toVo() {
VendorApprovedItemVo vo = new VendorApprovedItemVo();
vo.setId(getId());
vo.setListId(getList() != null ? getList().getId() : null);
vo.setVendorId(getVendor() != null ? getVendor().getId() : null);

10
common/src/main/java/com/ecep/contract/model/VendorEntity.java
View File

@@ -6,7 +6,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorEntityVo;
import com.ecep.contract.vo.VendorEntityVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -31,7 +31,7 @@ import lombok.ToString;
})
@ToString
public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable<CompanyVendorEntityVo> {
public class VendorEntity implements IdentityEntity, Serializable, Voable<VendorEntityVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -102,7 +102,7 @@ public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable
return true;
if (object == null || HibernateProxyUtils.isNotEffectiveClassEquals(this, object))
return false;
CompanyVendorEntity that = (CompanyVendorEntity) object;
VendorEntity that = (VendorEntity) object;
return getId() != null && Objects.equals(getId(), that.getId());
}
@@ -112,8 +112,8 @@ public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable
}
@Override
public CompanyVendorEntityVo toVo() {
CompanyVendorEntityVo vo = new CompanyVendorEntityVo();
public VendorEntityVo toVo() {
VendorEntityVo vo = new VendorEntityVo();
vo.setId(id);
if (vendor != null) {
vo.setVendorId(vendor.getId());

10
common/src/main/java/com/ecep/contract/model/VendorFile.java
View File

@@ -6,7 +6,7 @@ import java.util.Objects;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorFileVo;
import com.ecep.contract.vo.VendorFileVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -31,7 +31,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_VENDOR_FILE")
@ToString
public class CompanyVendorFile implements CompanyBasicFile<VendorFileType>, Serializable, Voable<CompanyVendorFileVo> {
public class VendorFile implements CompanyBasicFile<VendorFileType>, Serializable, Voable<VendorFileVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -77,7 +77,7 @@ public class CompanyVendorFile implements CompanyBasicFile<VendorFileType>, Seri
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
return false;
}
CompanyVendorFile that = (CompanyVendorFile) object;
VendorFile that = (VendorFile) object;
return getId() != null && Objects.equals(getId(), that.getId());
}
@@ -87,8 +87,8 @@ public class CompanyVendorFile implements CompanyBasicFile<VendorFileType>, Seri
}
@Override
public CompanyVendorFileVo toVo() {
CompanyVendorFileVo vo = new CompanyVendorFileVo();
public VendorFileVo toVo() {
VendorFileVo vo = new VendorFileVo();
vo.setId(getId());
if (getVendor() != null) {
vo.setVendorId(getVendor().getId());

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

@@ -5,7 +5,7 @@ import java.time.LocalDate;
import lombok.Data;
@Data
public class CompanyVendorApprovedFileVo implements IdentityEntity {
public class VendorApprovedFileVo implements IdentityEntity {
private Integer id;
private Integer listId;
private String fileName;

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

@@ -9,7 +9,7 @@ import lombok.Data;
* 供应商审批项目VO类
*/
@Data
public class CompanyVendorApprovedItemVo implements IdentityEntity {
public class VendorApprovedItemVo implements IdentityEntity {
private Integer id;
private Integer listId;
private Integer vendorId;

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

@@ -10,7 +10,7 @@ import lombok.Data;
* 合格供应商名录VO类
*/
@Data
public class CompanyVendorApprovedListVo implements IdentityEntity {
public class VendorApprovedVo implements IdentityEntity {
private Integer id;
private String title;
private LocalDate publishDate;

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

@@ -11,7 +11,7 @@ import lombok.Data;
* 供应商的关联详细项VO类
*/
@Data
public class CompanyVendorEntityVo implements IdentityEntity {
public class VendorEntityVo implements IdentityEntity {
private Integer id;
private Integer vendorId;
private String name;

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

@@ -11,7 +11,7 @@ import lombok.Data;
* 供应商的文件VO类
*/
@Data
public class CompanyVendorFileVo implements IdentityEntity {
public class VendorFileVo implements IdentityEntity {
private Integer id;
private Integer vendorId;
private VendorFileType type;

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

@@ -9,7 +9,7 @@ import com.ecep.contract.model.IdentityEntity;
import lombok.Data;
@Data
public class CompanyVendorVo implements IdentityEntity, CompanyBasedVo {
public class VendorVo implements IdentityEntity, CompanyBasedVo {
private Integer id;
private VendorType type;
private boolean protocolProvider = false;