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
client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.vo.CompanyVendorApprovedFileVo;
import com.ecep.contract.vo.VendorApprovedFileVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@@ -14,9 +14,9 @@ import lombok.ToString;
@Data
@EqualsAndHashCode(callSuper = false)
@ToString
public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<CompanyVendorApprovedFileVo> {
public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<VendorApprovedFileVo> {
public static CompanyVendorApprovedFileViewModel from(CompanyVendorApprovedFileVo companyVendorApprovedItemFile) {
public static CompanyVendorApprovedFileViewModel from(VendorApprovedFileVo companyVendorApprovedItemFile) {
CompanyVendorApprovedFileViewModel viewModel = new CompanyVendorApprovedFileViewModel();
viewModel.update(companyVendorApprovedItemFile);
return viewModel;
@@ -35,7 +35,7 @@ public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<Compan
private SimpleStringProperty description = new SimpleStringProperty();
@Override
protected void updateFrom(CompanyVendorApprovedFileVo v) {
protected void updateFrom(VendorApprovedFileVo v) {
super.updateFrom(v);
getList().set(v.getListId());
getFileName().set(v.getFileName());
@@ -44,7 +44,7 @@ public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<Compan
}
@Override
public boolean copyTo(CompanyVendorApprovedFileVo v) {
public boolean copyTo(VendorApprovedFileVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(list.get(), v.getListId())) {
v.setListId(list.get());

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedItemViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.vo.CompanyVendorApprovedItemVo;
import com.ecep.contract.vo.VendorApprovedItemVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@@ -12,8 +12,8 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<CompanyVendorApprovedItemVo> {
public static CompanyVendorApprovedItemViewModel from(CompanyVendorApprovedItemVo item) {
public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<VendorApprovedItemVo> {
public static CompanyVendorApprovedItemViewModel from(VendorApprovedItemVo item) {
CompanyVendorApprovedItemViewModel model = new CompanyVendorApprovedItemViewModel();
model.update(item);
return model;
@@ -29,7 +29,7 @@ public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<Compan
private SimpleStringProperty description = new SimpleStringProperty();
@Override
protected void updateFrom(CompanyVendorApprovedItemVo v) {
protected void updateFrom(VendorApprovedItemVo v) {
super.updateFrom(v);
getList().set(v.getListId());
getVendorName().set(v.getVendorName());
@@ -39,7 +39,7 @@ public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<Compan
}
@Override
public boolean copyTo(CompanyVendorApprovedItemVo v) {
public boolean copyTo(VendorApprovedItemVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(vendorName.get(), v.getVendorName())) {
v.setVendorName(vendorName.get());

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedListViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.vo.CompanyVendorApprovedListVo;
import com.ecep.contract.vo.VendorApprovedVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
@@ -13,20 +13,20 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorApprovedListViewModel
extends IdentityViewModel<CompanyVendorApprovedListVo> {
extends IdentityViewModel<VendorApprovedVo> {
private SimpleStringProperty title = new SimpleStringProperty();
private SimpleObjectProperty<LocalDate> publishDate = new SimpleObjectProperty<>();
private SimpleStringProperty path = new SimpleStringProperty();
private SimpleStringProperty description = new SimpleStringProperty();
public static CompanyVendorApprovedListViewModel from(CompanyVendorApprovedListVo list) {
public static CompanyVendorApprovedListViewModel from(VendorApprovedVo list) {
CompanyVendorApprovedListViewModel model = new CompanyVendorApprovedListViewModel();
model.update(list);
return model;
}
@Override
protected void updateFrom(CompanyVendorApprovedListVo v) {
protected void updateFrom(VendorApprovedVo v) {
super.updateFrom(v);
getTitle().set(v.getTitle());
getPublishDate().set(v.getPublishDate());
@@ -35,7 +35,7 @@ public class CompanyVendorApprovedListViewModel
}
@Override
public boolean copyTo(CompanyVendorApprovedListVo v) {
public boolean copyTo(VendorApprovedVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(title.get(), v.getTitle())) {

8
client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java
View File

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.time.LocalDateTime;
import com.ecep.contract.vo.CompanyVendorEntityVo;
import com.ecep.contract.vo.VendorEntityVo;
import javafx.beans.property.SimpleObjectProperty;
import lombok.Data;
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendorEntityVo> {
public class CompanyVendorEntityViewModel extends IdentityViewModel<VendorEntityVo> {
private SimpleObjectProperty<Integer> vendorId = new SimpleObjectProperty<>();
private SimpleObjectProperty<String> name = new SimpleObjectProperty<>();
private SimpleObjectProperty<String> abbName = new SimpleObjectProperty<>();
@@ -27,7 +27,7 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendo
private SimpleObjectProperty<LocalDateTime> fetchedTime = new SimpleObjectProperty<>();
@Override
protected void updateFrom(CompanyVendorEntityVo v) {
protected void updateFrom(VendorEntityVo v) {
super.updateFrom(v);
if (v.getVendorId() != null) {
vendorId.set(v.getVendorId());
@@ -51,7 +51,7 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendo
}
@Override
public boolean copyTo(CompanyVendorEntityVo v) {
public boolean copyTo(VendorEntityVo v) {
boolean modified = super.copyTo(v);
if (vendorId.get() != 0) {
v.setVendorId(vendorId.get());

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorFileViewModel.java
View File

@@ -4,7 +4,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.vo.CompanyVendorFileVo;
import com.ecep.contract.vo.VendorFileVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleObjectProperty;
@@ -16,7 +16,7 @@ import lombok.ToString;
@Data
@EqualsAndHashCode(callSuper = false)
@ToString
public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorFileVo> {
public class CompanyVendorFileViewModel extends IdentityViewModel<VendorFileVo> {
/**
*
*/
@@ -35,7 +35,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
private SimpleBooleanProperty valid = new SimpleBooleanProperty(this, "valid", false);
@Override
protected void updateFrom(CompanyVendorFileVo v) {
protected void updateFrom(VendorFileVo v) {
super.updateFrom(v);
getVendor().set(v.getVendorId());
getType().set(v.getType());
@@ -47,7 +47,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
}
@Override
public boolean copyTo(CompanyVendorFileVo v) {
public boolean copyTo(VendorFileVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(getVendor().get(), v.getVendorId())) {
v.setVendorId(getVendor().get());
@@ -76,7 +76,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
return modified;
}
public static CompanyVendorFileViewModel from(CompanyVendorFileVo companyVendorFile) {
public static CompanyVendorFileViewModel from(VendorFileVo companyVendorFile) {
CompanyVendorFileViewModel model = new CompanyVendorFileViewModel();
model.update(companyVendorFile);
return model;

10
client/src/main/java/com/ecep/contract/vm/CompanyVendorViewModel.java
View File

@@ -7,7 +7,7 @@ import java.time.ZonedDateTime;
import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.vo.CompanyVendorVo;
import com.ecep.contract.vo.VendorVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleIntegerProperty;
@@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
public class CompanyVendorViewModel extends IdentityViewModel<VendorVo> {
private SimpleStringProperty code = new SimpleStringProperty();
private SimpleStringProperty state = new SimpleStringProperty();
@@ -68,13 +68,13 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
private SimpleObjectProperty<LocalDateTime> created = new SimpleObjectProperty<>();
private SimpleIntegerProperty version = new SimpleIntegerProperty();
public static CompanyVendorViewModel from(CompanyVendorVo companyVendor) {
public static CompanyVendorViewModel from(VendorVo companyVendor) {
CompanyVendorViewModel model = new CompanyVendorViewModel();
model.update(companyVendor);
return model;
}
public void updateFrom(CompanyVendorVo v) {
public void updateFrom(VendorVo v) {
super.updateFrom(v);
// getState().set(v.getState());
getType().set(v.getType());
@@ -100,7 +100,7 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
version.set(v.getVersion());
}
public boolean copyTo(CompanyVendorVo v) {
public boolean copyTo(VendorVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(type.get(), v.getType())) {
v.setType(type.get());

10
client/src/main/java/com/ecep/contract/vm/VendorEntityViewModel.java
View File

@@ -4,7 +4,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.model.Vendor;
import com.ecep.contract.model.CompanyVendorEntity;
import com.ecep.contract.model.VendorEntity;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.VendorCatalog;
@@ -15,7 +15,7 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class VendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity> {
public class VendorEntityViewModel extends IdentityViewModel<VendorEntity> {
private SimpleStringProperty name = new SimpleStringProperty();
private SimpleStringProperty abbName = new SimpleStringProperty();
private SimpleStringProperty code = new SimpleStringProperty();
@@ -41,14 +41,14 @@ public class VendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity
public static VendorEntityViewModel from(CompanyVendorEntity cc) {
public static VendorEntityViewModel from(VendorEntity cc) {
VendorEntityViewModel model = new VendorEntityViewModel();
model.update(cc);
return model;
}
@Override
protected void updateFrom(CompanyVendorEntity v) {
protected void updateFrom(VendorEntity v) {
super.updateFrom(v);
getName().set(v.getName());
getAbbName().set(v.getAbbName());
@@ -63,7 +63,7 @@ public class VendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity
}
@Override
public boolean copyTo(CompanyVendorEntity v) {
public boolean copyTo(VendorEntity v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(name.get(), v.getName())) {
v.setName(name.get());