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

refactor(model): 重构模型类包结构并优化序列化处理

Browse Source 
重构模型类包结构，将模型类按功能模块划分到不同的子包中。优化序列化处理，为VO类添加serialVersionUID并实现Serializable接口。移除部分冗余的serialVersionUID字段，简化模型类代码。同时修复UITools中空值处理的问题，并更新pom版本至0.0.100-SNAPSHOT。

- 将模型类按功能模块划分到ds子包中
- 为VO类添加序列化支持
- 移除冗余的serialVersionUID字段
- 修复UITools空值处理问题
- 更新项目版本号
This commit is contained in:
宋其青
2025-10-09 18:27:48 +08:00
parent 51b8c16798
commit c4eec0a9dd
457 changed files with 8426 additions and 3669 deletions
Download Patch File Download Diff File Expand all files Collapse all files

93
client/src/main/java/com/ecep/contract/vm/CloudRkViewModel.java
View File

@@ -1,6 +1,7 @@
package com.ecep.contract.vm;
import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.vo.CloudRkVo;
@@ -95,7 +96,7 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRkVo> {
vm.updateFrom(v);
return vm;
}
@Override
protected void updateFrom(CloudRkVo v) {
super.updateFrom(v);
@@ -122,24 +123,78 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRkVo> {
@Override
public boolean copyTo(CloudRkVo v) {
boolean result = super.copyTo(v);
v.setCloudId(cloudId.get());
v.setUpdateDays(updateDays.get());
v.setAutoUpdate(autoUpdate.get());
v.setDescription(description.get());
v.setRank(rank.get());
v.setRankDescription(rankDescription.get());
v.setCustomerGrade(customerGrade.get());
v.setCustomerDescription(customerDescription.get());
v.setCustomerScore(customerScore.get());
v.setVendorGrade(vendorGrade.get());
v.setVendorDescription(vendorDescription.get());
v.setVendorScore(vendorScore.get());
v.setCompanyId(company.get());
v.setLatestUpdate(latestUpdate.get());
v.setCloudEntUpdate(cloudEntUpdate.get());
v.setCloudBlackListUpdated(cloudBlackListUpdated.get());
v.setCloudLatest(cloudLatest.get());
v.setVersion(version.get());
if (!Objects.equals(v.getCloudId(), cloudId.get())) {
v.setCloudId(cloudId.get());
result = true;
}
if (!Objects.equals(v.getUpdateDays(), updateDays.get())) {
v.setUpdateDays(updateDays.get());
result = true;
}
if (!Objects.equals(v.isAutoUpdate(), autoUpdate.get())) {
v.setAutoUpdate(autoUpdate.get());
result = true;
}
if (!Objects.equals(v.getDescription(), description.get())) {
v.setDescription(description.get());
result = true;
}
if (!Objects.equals(v.getRank(), rank.get())) {
v.setRank(rank.get());
result = true;
}
if (!Objects.equals(v.getRankDescription(), rankDescription.get())) {
v.setRankDescription(rankDescription.get());
result = true;
}
if (!Objects.equals(v.getCustomerGrade(), customerGrade.get())) {
v.setCustomerGrade(customerGrade.get());
result = true;
}
if (!Objects.equals(v.getCustomerDescription(), customerDescription.get())) {
v.setCustomerDescription(customerDescription.get());
result = true;
}
if (!Objects.equals(v.getCustomerScore(), customerScore.get())) {
v.setCustomerScore(customerScore.get());
result = true;
}
if (!Objects.equals(v.getVendorGrade(), vendorGrade.get())) {
v.setVendorGrade(vendorGrade.get());
result = true;
}
if (!Objects.equals(v.getVendorDescription(), vendorDescription.get())) {
v.setVendorDescription(vendorDescription.get());
result = true;
}
if (!Objects.equals(v.getVendorScore(), vendorScore.get())) {
v.setVendorScore(vendorScore.get());
result = true;
}
if (!Objects.equals(v.getCompanyId(), company.get())) {
v.setCompanyId(company.get());
result = true;
}
if (!Objects.equals(v.getLatestUpdate(), latestUpdate.get())) {
v.setLatestUpdate(latestUpdate.get());
result = true;
}
if (!Objects.equals(v.getCloudEntUpdate(), cloudEntUpdate.get())) {
v.setCloudEntUpdate(cloudEntUpdate.get());
result = true;
}
if (!Objects.equals(v.getCloudBlackListUpdated(), cloudBlackListUpdated.get())) {
v.setCloudBlackListUpdated(cloudBlackListUpdated.get());
result = true;
}
if (!Objects.equals(v.getCloudLatest(), cloudLatest.get())) {
v.setCloudLatest(cloudLatest.get());
result = true;
}
if (!Objects.equals(v.getVersion(), version.get())) {
v.setVersion(version.get());
result = true;
}
return result;
}
}

51
client/src/main/java/com/ecep/contract/vm/CloudTycInfoViewModel.java
View File

@@ -16,57 +16,52 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class CloudTycInfoViewModel extends IdentityViewModel<CloudTycVo> {
/**
* 云端Id
*/
private SimpleStringProperty cloudId = new SimpleStringProperty();
/**
* 公司, Company
*/
private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
/**
* 云端Id
*/
private SimpleStringProperty cloudId = new SimpleStringProperty();
/**
* 天眼查得分
*/
private SimpleIntegerProperty score = new SimpleIntegerProperty();
private SimpleObjectProperty<LocalDateTime> cloudLatest = new SimpleObjectProperty<>();
/**
* 最后更新日期
*/
private SimpleObjectProperty<LocalDateTime> latest = new SimpleObjectProperty<>();
private SimpleObjectProperty<LocalDateTime> latestUpdate = new SimpleObjectProperty<>();
/**
* Version
*/
private SimpleIntegerProperty version = new SimpleIntegerProperty();
private SimpleIntegerProperty score = new SimpleIntegerProperty();
private SimpleObjectProperty<LocalDateTime> cloudLatest = new SimpleObjectProperty<>();
@Override
protected void updateFrom(CloudTycVo info) {
super.updateFrom(info);
update_((CloudTycVo) info);
}
private void update_(CloudTycVo info) {
score.set(info.getScore());
cloudId.set(info.getCloudId());
company.set(info.getCompanyId());
if (info.getCloudLatest() != null) {
ZoneId zone = ZoneId.systemDefault();
ZonedDateTime zonedDateTime = info.getCloudLatest().atZone(zone);
LocalDateTime localDateTime = zonedDateTime.toLocalDateTime();
cloudLatest.set(localDateTime);
cloudLatest.set(info.getCloudLatest());
} else {
cloudLatest.set(null);
}
latestUpdate.set(info.getLatestUpdate());
version.set(info.getVersion());
}
@Override
public boolean copyTo(CloudTycVo info) {
boolean modified = super.copyTo(info);
if (copyTo_((CloudTycVo) info)) {
if (!Objects.equals(info.getCompanyId(), getCompany().get())) {
info.setCompanyId(getCompany().get());
modified = true;
}
return modified;
}
private boolean copyTo_(CloudTycVo info) {
boolean modified = super.copyTo(info);
if (!Objects.equals(info.getId(), getId().get())) {
info.setId(getId().get());
if (!Objects.equals(info.getCloudId(), cloudId.get())) {
info.setCloudId(cloudId.get());
modified = true;
}
@@ -79,6 +74,14 @@ public class CloudTycInfoViewModel extends IdentityViewModel<CloudTycVo> {
info.setCloudLatest(cloudLatest.get());
modified = true;
}
if (!Objects.equals(info.getLatestUpdate(), latestUpdate.get())) {
info.setLatestUpdate(latestUpdate.get());
modified = true;
}
if (!Objects.equals(info.getVersion(), version.get())) {
info.setVersion(version.get());
modified = true;
}
return modified;
}

26
client/src/main/java/com/ecep/contract/vm/CloudYuInfoViewModel.java
View File

@@ -26,11 +26,8 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
/**
* 最后更新日期
*/
private SimpleObjectProperty<LocalDateTime> latest = new SimpleObjectProperty<>();
/**
* Version
*/
private SimpleIntegerProperty version = new SimpleIntegerProperty();
private SimpleObjectProperty<LocalDateTime> latestUpdate = new SimpleObjectProperty<>();
private SimpleStringProperty vendorCode = new SimpleStringProperty();
private SimpleStringProperty vendorClassCode = new SimpleStringProperty();
private SimpleObjectProperty<LocalDate> vendorDevelopDate = new SimpleObjectProperty<>();
@@ -41,17 +38,20 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
private SimpleObjectProperty<LocalDateTime> cloudLatest = new SimpleObjectProperty<>();
/**
* Version
*/
private SimpleIntegerProperty version = new SimpleIntegerProperty();
@Override
protected void updateFrom(CloudYuVo info) {
super.updateFrom(info);
update_((CloudYuVo) info);
}
private void update_(CloudYuVo info) {
vendorCode.set(info.getExceptionMessage());
vendorDevelopDate.set(info.getVendorUpdateDate());
customerDevelopDate.set(info.getCustomerUpdateDate());
cloudLatest.set(info.getCloudLatest());
latestUpdate.set(info.getLatestUpdate());
version.set(info.getVersion());
}
@Override
@@ -82,6 +82,14 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
info.setCloudLatest(cloudLatest.get());
modified = true;
}
if (!Objects.equals(info.getLatestUpdate(), latestUpdate.get())) {
info.setLatestUpdate(latestUpdate.get());
modified = true;
}
if (!Objects.equals(info.getVersion(), version.get())) {
info.setVersion(version.get());
modified = true;
}
return modified;
}

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

@@ -1,17 +1,15 @@
package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.model.CompanyContact;
import com.ecep.contract.vo.CompanyContactVo;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Objects;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyContactViewModel extends IdentityViewModel<CompanyContactVo> {

34
client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileTypeLocalViewModel.java
View File

@@ -1,13 +1,45 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.vo.CustomerFileTypeLocalVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class CompanyCustomerFileTypeLocalViewModel extends EnumViewModel<CustomerFileType, CustomerFileTypeLocalVo> {
public class CompanyCustomerFileTypeLocalViewModel extends IdentityViewModel<CustomerFileTypeLocalVo> {
private SimpleObjectProperty<CustomerFileType> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(CustomerFileTypeLocalVo v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(CustomerFileTypeLocalVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(v.getType(), type.get())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(v.getLang(), lang.get())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(v.getValue(), value.get())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}

7
client/src/main/java/com/ecep/contract/vm/CompanyExtendInfoViewModel.java
View File

@@ -1,17 +1,14 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.model.CompanyExtendInfo;
import com.ecep.contract.vo.CompanyExtendInfoVo;
import com.ecep.contract.vo.CompanyVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleObjectProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Objects;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyExtendInfoViewModel extends IdentityViewModel<CompanyExtendInfoVo> {

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

@@ -1,19 +1,17 @@
package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.CompanyFileType;
import com.ecep.contract.model.CompanyFile;
import com.ecep.contract.vo.CompanyFileVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Objects;
/**
* View Model for {@link CompanyFile}
* View Model for {@link CompanyFileVo}
*/
@Data
@EqualsAndHashCode(callSuper = false)

13
client/src/main/java/com/ecep/contract/vm/CompanyInvoiceInfoViewModel.java
View File

@@ -1,16 +1,15 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.model.CompanyInvoiceInfo;
import com.ecep.contract.vo.CompanyInvoiceInfoVo;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.util.Objects;
@Data
@EqualsAndHashCode(callSuper = false)
public class CompanyInvoiceInfoViewModel extends IdentityViewModel<CompanyInvoiceInfo> {
public class CompanyInvoiceInfoViewModel extends IdentityViewModel<CompanyInvoiceInfoVo> {
private SimpleStringProperty name = new SimpleStringProperty();
private SimpleStringProperty taxId = new SimpleStringProperty();
private SimpleStringProperty address = new SimpleStringProperty();
@@ -19,7 +18,7 @@ public class CompanyInvoiceInfoViewModel extends IdentityViewModel<CompanyInvoic
private SimpleStringProperty bankAccount = new SimpleStringProperty();
@Override
protected void updateFrom(CompanyInvoiceInfo v) {
protected void updateFrom(CompanyInvoiceInfoVo v) {
super.updateFrom(v);
name.set(v.getName());
taxId.set(v.getTaxId());
@@ -30,7 +29,7 @@ public class CompanyInvoiceInfoViewModel extends IdentityViewModel<CompanyInvoic
}
@Override
public boolean copyTo(CompanyInvoiceInfo v) {
public boolean copyTo(CompanyInvoiceInfoVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(name.get(), v.getName())) {
v.setName(name.get());

5
client/src/main/java/com/ecep/contract/vm/ContractBidVendorViewModel.java
View File

@@ -33,7 +33,6 @@ public class ContractBidVendorViewModel extends IdentityViewModel<ContractBidVen
getContractId().set(v.getContractId() != null ? v.getContractId() : 0);
getCompanyId().set(v.getCompanyId() != null ? v.getCompanyId() : 0);
getQuotationSheetFileId().set(v.getQuotationSheetFileId() != null ? v.getQuotationSheetFileId() : 0);
getQuotationSheetFileName().set(v.getQuotationSheetFileName());
}
@Override
@@ -51,10 +50,6 @@ public class ContractBidVendorViewModel extends IdentityViewModel<ContractBidVen
v.setQuotationSheetFileId(getQuotationSheetFileId().get() != 0 ? getQuotationSheetFileId().get() : null);
modified = true;
}
if (!Objects.equals(getQuotationSheetFileName().get(), v.getQuotationSheetFileName())) {
v.setQuotationSheetFileName(getQuotationSheetFileName().get());
modified = true;
}
return modified;
}
}

23
client/src/main/java/com/ecep/contract/vm/ContractFileTypeLocalViewModel.java
View File

@@ -3,9 +3,8 @@ package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.ContractFileType;
import com.ecep.contract.model.ContractFileTypeLocal;
import com.ecep.contract.vo.ContractFileTypeLocalVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
@@ -13,18 +12,36 @@ import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = false)
public class ContractFileTypeLocalViewModel extends EnumViewModel<ContractFileType, ContractFileTypeLocalVo> {
public class ContractFileTypeLocalViewModel extends IdentityViewModel<ContractFileTypeLocalVo> {
private SimpleObjectProperty<ContractFileType> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
private SimpleStringProperty suggestFileName = new SimpleStringProperty();
@Override
protected void updateFrom(ContractFileTypeLocalVo v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
suggestFileName.set(v.getSuggestFileName());
}
@Override
public boolean copyTo(ContractFileTypeLocalVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(type.get(), v.getType())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(lang.get(), v.getLang())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(value.get(), v.getValue())) {
v.setValue(value.get());
ret = true;
}
if (!Objects.equals(suggestFileName.get(), v.getSuggestFileName())) {
v.setSuggestFileName(suggestFileName.get());
ret = true;

2
client/src/main/java/com/ecep/contract/vm/ContractItemComposeViewModel.java
View File

@@ -1,8 +1,6 @@
package com.ecep.contract.vm;
import com.ecep.contract.model.ContractItem;
import com.ecep.contract.vo.ContractItemVo;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleIntegerProperty;
import javafx.beans.property.SimpleListProperty;

2
client/src/main/java/com/ecep/contract/vm/ContractPayPlanViewModel.java
View File

@@ -4,8 +4,6 @@ import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.ContractPayPlan;
import com.ecep.contract.vo.ContractPayPlanVo;
import javafx.beans.property.SimpleDoubleProperty;

36
client/src/main/java/com/ecep/contract/vm/CustomerFileTypeLocalViewModel.java
View File

@@ -1,11 +1,45 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.CustomerFileType;
import com.ecep.contract.vo.CustomerFileTypeLocalVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class CustomerFileTypeLocalViewModel extends EnumViewModel<CustomerFileType, CustomerFileTypeLocalVo> {
public class CustomerFileTypeLocalViewModel extends IdentityViewModel<CustomerFileTypeLocalVo> {
private SimpleObjectProperty<CustomerFileType> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(CustomerFileTypeLocalVo v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(CustomerFileTypeLocalVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(v.getType(), type.get())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(v.getLang(), lang.get())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(v.getValue(), value.get())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}

9
client/src/main/java/com/ecep/contract/vm/InventoryViewModel.java
View File

@@ -11,6 +11,7 @@ import com.ecep.contract.model.Price;
import com.ecep.contract.model.VolumeSize;
import com.ecep.contract.vo.InventoryVo;
import com.ecep.contract.vo.VolumeSizeVo;
import javafx.beans.property.SimpleBooleanProperty;
import javafx.beans.property.SimpleDoubleProperty;
import javafx.beans.property.SimpleFloatProperty;
@@ -102,13 +103,13 @@ public class InventoryViewModel extends IdentityViewModel<InventoryVo> {
getWeight().set(v.getWeight());
getPackagedWeight().set(v.getPackagedWeight());
VolumeSize volumeSize = v.getVolumeSize();
VolumeSizeVo volumeSize = v.getVolumeSize();
getSizeLength().set(volumeSize.getLength());
getSizeWidth().set(volumeSize.getWidth());
getSizeHeight().set(volumeSize.getHeight());
getVolume().set(volumeSize.getVolume());
VolumeSize packagedVolumeSize = v.getPackagedVolumeSize();
VolumeSizeVo packagedVolumeSize = v.getPackagedVolumeSize();
getPackagedSizeLength().set(packagedVolumeSize.getLength());
getPackagedSizeWidth().set(packagedVolumeSize.getWidth());
getPackagedSizeHeight().set(packagedVolumeSize.getHeight());
@@ -208,7 +209,7 @@ public class InventoryViewModel extends IdentityViewModel<InventoryVo> {
modified = true;
}
VolumeSize volumeSize = v.getVolumeSize();
VolumeSizeVo volumeSize = v.getVolumeSize();
if (!Objects.equals(getSizeLength().get(), volumeSize.getLength())) {
volumeSize.setLength(getSizeLength().get());
modified = true;
@@ -226,7 +227,7 @@ public class InventoryViewModel extends IdentityViewModel<InventoryVo> {
modified = true;
}
VolumeSize packagedVolumeSize = v.getPackagedVolumeSize();
VolumeSizeVo packagedVolumeSize = v.getPackagedVolumeSize();
if (!Objects.equals(getPackagedSizeHeight().get(), packagedVolumeSize.getHeight())) {
packagedVolumeSize.setHeight(getPackagedSizeHeight().get());
modified = true;

35
client/src/main/java/com/ecep/contract/vm/ProjectFileTypeLocalViewModel.java
View File

@@ -1,12 +1,45 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.ProjectFileType;
import com.ecep.contract.vo.ProjectFileTypeLocalVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class ProjectFileTypeLocalViewModel extends EnumViewModel<ProjectFileType, ProjectFileTypeLocalVo> {
public class ProjectFileTypeLocalViewModel extends IdentityViewModel<ProjectFileTypeLocalVo> {
private SimpleObjectProperty<ProjectFileType> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(ProjectFileTypeLocalVo v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(ProjectFileTypeLocalVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(v.getType(), type.get())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(v.getLang(), lang.get())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(v.getValue(), value.get())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}

3
client/src/main/java/com/ecep/contract/vm/SalesOrderViewModel.java
View File

@@ -3,9 +3,6 @@ package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.model.Contract;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.SalesOrder;
import com.ecep.contract.vo.SalesOrderVo;
import javafx.beans.property.SimpleIntegerProperty;

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

@@ -1,38 +1,34 @@
package com.ecep.contract.vm;
import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.model.Vendor;
import com.ecep.contract.model.VendorEntity;
import com.ecep.contract.model.Employee;
import com.ecep.contract.model.VendorCatalog;
import com.ecep.contract.vo.VendorEntityVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import java.time.LocalDate;
import java.util.Objects;
@Data
@EqualsAndHashCode(callSuper = false)
public class VendorEntityViewModel extends IdentityViewModel<VendorEntity> {
public class VendorEntityViewModel extends IdentityViewModel<VendorEntityVo> {
private SimpleStringProperty name = new SimpleStringProperty();
private SimpleStringProperty abbName = new SimpleStringProperty();
private SimpleStringProperty code = new SimpleStringProperty();
/**
* 分组
*/
private SimpleObjectProperty<VendorCatalog> catalog = new SimpleObjectProperty<>();
private SimpleObjectProperty<Integer> catalog = new SimpleObjectProperty<>();
/**
* 关联的企业
*/
private SimpleObjectProperty<Vendor> vendor = new SimpleObjectProperty<>();
private SimpleObjectProperty<Integer> vendor = new SimpleObjectProperty<>();
/**
* 发展日期
*/
private SimpleObjectProperty<LocalDate> developDate = new SimpleObjectProperty<>();
private SimpleObjectProperty<Employee> creator = new SimpleObjectProperty<>();
private SimpleObjectProperty<Employee> modifier = new SimpleObjectProperty<>();
private SimpleObjectProperty<Integer> creator = new SimpleObjectProperty<>();
private SimpleObjectProperty<Integer> modifier = new SimpleObjectProperty<>();
private SimpleObjectProperty<LocalDate> modifyDate = new SimpleObjectProperty<>();
/**
* 从U8系统同步时间
@@ -40,30 +36,29 @@ public class VendorEntityViewModel extends IdentityViewModel<VendorEntity> {
private SimpleObjectProperty<LocalDate> updatedDate = new SimpleObjectProperty<>();
public static VendorEntityViewModel from(VendorEntity cc) {
public static VendorEntityViewModel from(VendorEntityVo cc) {
VendorEntityViewModel model = new VendorEntityViewModel();
model.update(cc);
return model;
}
@Override
protected void updateFrom(VendorEntity v) {
protected void updateFrom(VendorEntityVo v) {
super.updateFrom(v);
getName().set(v.getName());
getAbbName().set(v.getAbbName());
getCode().set(v.getCode());
getCatalog().set(v.getCatalog());
getVendor().set(v.getVendor());
getCatalog().set(v.getCatalogId());
getVendor().set(v.getVendorId());
getDevelopDate().set(v.getDevelopDate());
getCreator().set(v.getCreator());
getModifier().set(v.getModifier());
getCreator().set(v.getCreatorId());
getModifier().set(v.getModifierId());
getModifyDate().set(v.getModifyDate());
getUpdatedDate().set(v.getUpdatedDate());
}
@Override
public boolean copyTo(VendorEntity v) {
public boolean copyTo(VendorEntityVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(name.get(), v.getName())) {
v.setName(name.get());
@@ -77,24 +72,24 @@ public class VendorEntityViewModel extends IdentityViewModel<VendorEntity> {
v.setCode(code.get());
modified = true;
}
if (!Objects.equals(catalog.get(), v.getCatalog())) {
v.setCatalog(catalog.get());
if (!Objects.equals(catalog.get(), v.getCatalogId())) {
v.setCatalogId(catalog.get());
modified = true;
}
if (!Objects.equals(vendor.get(), v.getVendor())) {
v.setVendor(vendor.get());
if (!Objects.equals(vendor.get(), v.getVendorId())) {
v.setVendorId(vendor.get());
modified = true;
}
if (!Objects.equals(developDate.get(), v.getDevelopDate())) {
v.setDevelopDate(developDate.get());
modified = true;
}
if (!Objects.equals(creator.get(), v.getCreator())) {
v.setCreator(creator.get());
if (!Objects.equals(creator.get(), v.getCreatorId())) {
v.setCreatorId(creator.get());
modified = true;
}
if (!Objects.equals(modifier.get(), v.getModifier())) {
v.setModifier(modifier.get());
if (!Objects.equals(modifier.get(), v.getModifierId())) {
v.setModifierId(modifier.get());
modified = true;
}
if (!Objects.equals(modifyDate.get(), v.getModifyDate())) {

36
client/src/main/java/com/ecep/contract/vm/VendorFileTypeLocalViewModel.java
View File

@@ -1,11 +1,45 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.VendorFileType;
import com.ecep.contract.vo.VendorFileTypeLocalVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class VendorFileTypeLocalViewModel extends EnumViewModel<VendorFileType, VendorFileTypeLocalVo> {
public class VendorFileTypeLocalViewModel extends IdentityViewModel<VendorFileTypeLocalVo> {
private SimpleObjectProperty<VendorFileType> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(VendorFileTypeLocalVo v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(VendorFileTypeLocalVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(v.getType(), type.get())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(v.getLang(), lang.get())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(v.getValue(), value.get())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}

36
client/src/main/java/com/ecep/contract/vm/VendorTypeLocalViewModel.java
View File

@@ -1,11 +1,45 @@
package com.ecep.contract.vm;
import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.vo.VendorTypeLocalVo;
import javafx.beans.property.SimpleObjectProperty;
import javafx.beans.property.SimpleStringProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
@Data
@EqualsAndHashCode(callSuper = true)
public class VendorTypeLocalViewModel extends EnumViewModel<VendorType, VendorTypeLocalVo> {
public class VendorTypeLocalViewModel extends IdentityViewModel<VendorTypeLocalVo> {
private SimpleObjectProperty<VendorType> type = new SimpleObjectProperty<>();
private SimpleStringProperty lang = new SimpleStringProperty();
private SimpleStringProperty value = new SimpleStringProperty();
@Override
protected void updateFrom(VendorTypeLocalVo v) {
super.updateFrom(v);
type.set(v.getType());
lang.set(v.getLang());
value.set(v.getValue());
}
@Override
public boolean copyTo(VendorTypeLocalVo v) {
boolean ret = super.copyTo(v);
if (!Objects.equals(v.getType(), type.get())) {
v.setType(type.get());
ret = true;
}
if (!Objects.equals(v.getLang(), lang.get())) {
v.setLang(lang.get());
ret = true;
}
if (!Objects.equals(v.getValue(), value.get())) {
v.setValue(value.get());
ret = true;
}
return ret;
}
}