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

refactor(service): 实现VoableService接口以统一VO与实体映射逻辑

Browse Source 
refactor(model): 重构实体类与VO类的字段映射关系
style: 调整代码格式与注释
fix: 修复部分字段映射错误
This commit is contained in:
宋其青
2025-09-26 12:31:08 +08:00
parent 045a1e9eed
commit 42a8f9ab30
67 changed files with 2277 additions and 610 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/src/main/java/com/ecep/contract/controller/tab/ContractTabSkinVendorBid.java
View File

@@ -95,6 +95,7 @@ public class ContractTabSkinVendorBid
showInOwner(VendorBidWindowController.class, item);
}
@SuppressWarnings("unchecked")
public void onBidVendorTableCreateAction(ActionEvent event) {
ContractVo contract = getParent();

44
client/src/main/java/com/ecep/contract/vm/PurchaseOrderViewModel.java
View File

@@ -20,8 +20,6 @@ public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrderVo> {
SimpleIntegerProperty refId = new SimpleIntegerProperty();
SimpleObjectProperty<Integer> contractId = new SimpleObjectProperty<>();
SimpleStringProperty code = new SimpleStringProperty();
SimpleStringProperty name = new SimpleStringProperty();
SimpleObjectProperty<Integer> vendorId = new SimpleObjectProperty<>();
SimpleObjectProperty<LocalDate> orderDate = new SimpleObjectProperty<>();
SimpleDoubleProperty totalAmount = new SimpleDoubleProperty();
SimpleDoubleProperty taxAmount = new SimpleDoubleProperty();
@@ -48,20 +46,10 @@ public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrderVo> {
getContractId().set(v.getContractId());
}
getCode().set(v.getCode());
getName().set(v.getName());
if (v.getVendorId() != null) {
getVendorId().set(v.getVendorId());
}
getOrderDate().set(v.getOrderDate());
getTotalAmount().set(v.getTotalAmount() != null ? v.getTotalAmount() : 0.0);
getTaxAmount().set(v.getTaxAmount() != null ? v.getTaxAmount() : 0.0);
getTaxRate().set(v.getTaxRate() != null ? v.getTaxRate() : 0.0);
if (v.getStatusId() != null) {
getStatusId().set(v.getStatusId());
}
getRemark().set(v.getRemark());
getActive().set(v.getActive() != null ? v.getActive() : false);
// 保留原有的员工相关字段设置
if (getEmployee() != null && getEmployee().get() != null) {
getEmployee().set(getEmployee().get());
@@ -107,18 +95,6 @@ public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrderVo> {
v.setCode(code.get());
modified = true;
}
if (!Objects.equals(name.get(), v.getName())) {
v.setName(name.get());
modified = true;
}
if (!Objects.equals(vendorId.get(), v.getVendorId())) {
v.setVendorId(vendorId.get());
modified = true;
}
if (!Objects.equals(orderDate.get(), v.getOrderDate())) {
v.setOrderDate(orderDate.get());
modified = true;
}
if (!Objects.equals(totalAmount.get(), v.getTotalAmount())) {
v.setTotalAmount(totalAmount.get());
modified = true;
@@ -131,21 +107,13 @@ public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrderVo> {
v.setTaxRate(taxRate.get());
modified = true;
}
if (!Objects.equals(statusId.get(), v.getStatusId())) {
v.setStatusId(statusId.get());
if (!Objects.equals(taxRate.get(), v.getTaxRate())) {
v.setTaxRate(taxRate.get());
modified = true;
}
if (!Objects.equals(remark.get(), v.getRemark())) {
v.setRemark(remark.get());
modified = true;
}
if (!Objects.equals(active.get(), v.getActive())) {
v.setActive(active.get());
modified = true;
}
// 保留原有的员工相关字段复制
if (!Objects.equals(description.get(), v.getRemark())) {
v.setRemark(description.get());
if (!Objects.equals(description.get(), v.getDescription())) {
v.setDescription(description.get());
modified = true;
}
return modified;

6
client/src/main/java/com/ecep/contract/vm/SalesOrderItemViewModel.java
View File

@@ -32,7 +32,7 @@ public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItemVo>
@Override
protected void updateFrom(SalesOrderItemVo v) {
super.updateFrom(v);
getOrder().set(v.getSalesOrderId());
getOrder().set(v.getOrderId());
getCode().set(v.getCode());
getName().set(v.getName());
getQuantity().set(v.getQuantity());
@@ -47,8 +47,8 @@ public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItemVo>
@Override
public boolean copyTo(SalesOrderItemVo v) {
boolean modified = super.copyTo(v);
if (!Objects.equals(order.get(), v.getSalesOrderId())) {
v.setSalesOrderId(order.get());
if (!Objects.equals(order.get(), v.getOrderId())) {
v.setOrderId(order.get());
modified = true;
}
if (!Objects.equals(code.get(), v.getCode())) {