refactor(vo): 重构VO对象结构，统一字段命名和接口实现

重构所有VO对象，统一字段命名规范，移除冗余字段，优化接口实现
新增Voable接口用于VO对象转换
调整BaseViewModel和ProjectBasedViewModel接口定义
更新相关服务和控制器以适应VO对象变更

client/src/main/java/com/ecep/contract/vm/BankViewModel.java

@@ -2,7 +2,6 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Bank;
 import com.ecep.contract.vo.BankVo;
 
 import javafx.beans.property.SimpleStringProperty;

client/src/main/java/com/ecep/contract/vm/BaseViewModel.java

@@ -84,6 +84,12 @@ public class BaseViewModel<T> {
     protected void updateFrom(T v) {
     }
 
+    /**
+     * 拷贝数据到Vo 中
+     *
+     * @param v 实体
+     * @return 如果有数据更新则 返回 true
+     */
     public boolean copyTo(T v) {
         return false;
     }

client/src/main/java/com/ecep/contract/vm/CloudRkViewModel.java

@@ -2,8 +2,7 @@ package com.ecep.contract.vm;
 
 import java.time.LocalDateTime;
 
-import com.ecep.contract.model.CloudRk;
-import com.ecep.contract.model.Company;
+import com.ecep.contract.vo.CloudRkVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -14,7 +13,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
+public class CloudRkViewModel extends IdentityViewModel<CloudRkVo> {
     /**
      * 云端Id
      */
@@ -64,9 +63,9 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
      */
     private SimpleStringProperty description = new SimpleStringProperty();
     /**
-     * 公司
+     * 公司, Company
      */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 最后更新日期
      */
@@ -88,8 +87,17 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
      */
     private SimpleIntegerProperty version = new SimpleIntegerProperty();
 
+    /**
+     * 从Vo创建ViewModel
+     */
+    public static CloudRkViewModel from(CloudRkVo v) {
+        CloudRkViewModel vm = new CloudRkViewModel();
+        vm.updateFrom(v);
+        return vm;
+    }
+    
     @Override
-    protected void updateFrom(CloudRk v) {
+    protected void updateFrom(CloudRkVo v) {
         super.updateFrom(v);
         cloudId.set(v.getCloudId());
         updateDays.set(v.getUpdateDays());
@@ -103,17 +111,16 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
         vendorGrade.set(v.getVendorGrade());
         vendorDescription.set(v.getVendorDescription());
         vendorScore.set(v.getVendorScore());
-        company.set(v.getCompany());
+        company.set(v.getCompanyId());
         latestUpdate.set(v.getLatestUpdate());
         cloudEntUpdate.set(v.getCloudEntUpdate());
         cloudBlackListUpdated.set(v.getCloudBlackListUpdated());
         cloudLatest.set(v.getCloudLatest());
-        cloudLatest.set(v.getCloudLatest());
         version.set(v.getVersion());
     }
 
     @Override
-    public boolean copyTo(CloudRk v) {
+    public boolean copyTo(CloudRkVo v) {
         boolean result = super.copyTo(v);
         v.setCloudId(cloudId.get());
         v.setUpdateDays(updateDays.get());
@@ -127,7 +134,7 @@ public class CloudRkViewModel extends IdentityViewModel<CloudRk> {
         v.setVendorGrade(vendorGrade.get());
         v.setVendorDescription(vendorDescription.get());
         v.setVendorScore(vendorScore.get());
-        v.setCompany(company.get());
+        v.setCompanyId(company.get());
         v.setLatestUpdate(latestUpdate.get());
         v.setCloudEntUpdate(cloudEntUpdate.get());
         v.setCloudBlackListUpdated(cloudBlackListUpdated.get());

client/src/main/java/com/ecep/contract/vm/CloudTycInfoViewModel.java

@@ -1,14 +1,11 @@
 package com.ecep.contract.vm;
 
-import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.CloudTyc;
-import com.ecep.contract.model.Company;
-import com.ecep.contract.util.MyDateTimePropertyUtils;
+import com.ecep.contract.vo.CloudTycVo;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -18,15 +15,15 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CloudTycInfoViewModel extends IdentityViewModel<CloudTyc> {
+public class CloudTycInfoViewModel extends IdentityViewModel<CloudTycVo> {
     /**
      * 云端Id
      */
     private SimpleStringProperty cloudId = new SimpleStringProperty();
     /**
-     * 公司
+     * 公司, Company
      */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 最后更新日期
      */
@@ -39,12 +36,12 @@ public class CloudTycInfoViewModel extends IdentityViewModel<CloudTyc> {
     private SimpleObjectProperty<LocalDateTime> cloudLatest = new SimpleObjectProperty<>();
 
     @Override
-    protected void updateFrom(CloudTyc info) {
+    protected void updateFrom(CloudTycVo info) {
         super.updateFrom(info);
-        update_((CloudTyc) info);
+        update_((CloudTycVo) info);
     }
 
-    private void update_(CloudTyc info) {
+    private void update_(CloudTycVo info) {
         score.set(info.getScore());
 
         if (info.getCloudLatest() != null) {
@@ -58,15 +55,15 @@ public class CloudTycInfoViewModel extends IdentityViewModel<CloudTyc> {
     }
 
     @Override
-    public boolean copyTo(CloudTyc info) {
+    public boolean copyTo(CloudTycVo info) {
         boolean modified = super.copyTo(info);
-        if (copyTo_((CloudTyc) info)) {
+        if (copyTo_((CloudTycVo) info)) {
             modified = true;
         }
         return modified;
     }
 
-    private boolean copyTo_(CloudTyc info) {
+    private boolean copyTo_(CloudTycVo info) {
         boolean modified = super.copyTo(info);
         if (!Objects.equals(info.getId(), getId().get())) {
             info.setId(getId().get());
@@ -78,16 +75,15 @@ public class CloudTycInfoViewModel extends IdentityViewModel<CloudTyc> {
             modified = true;
         }
 
-        Instant latest = MyDateTimePropertyUtils.localDateTimeToInstant(cloudLatest);
-        if (!Objects.equals(info.getCloudLatest(), latest)) {
-            info.setCloudLatest(latest);
+        if (!Objects.equals(info.getCloudLatest(), cloudLatest.get())) {
+            info.setCloudLatest(cloudLatest.get());
             modified = true;
         }
 
         return modified;
     }
 
-    public static CloudTycInfoViewModel from(CloudTyc cc) {
+    public static CloudTycInfoViewModel from(CloudTycVo cc) {
         CloudTycInfoViewModel model = new CloudTycInfoViewModel();
         model.update(cc);
         return model;

client/src/main/java/com/ecep/contract/vm/CloudYuInfoViewModel.java

@@ -1,15 +1,10 @@
 package com.ecep.contract.vm;
 
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.CloudYu;
-import com.ecep.contract.model.Company;
-import com.ecep.contract.util.MyDateTimePropertyUtils;
+import com.ecep.contract.vo.CloudYuVo;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -19,15 +14,15 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CloudYuInfoViewModel extends IdentityViewModel<CloudYu> {
-        /**
+public class CloudYuInfoViewModel extends IdentityViewModel<CloudYuVo> {
+    /**
      * 云端Id
      */
     private SimpleStringProperty cloudId = new SimpleStringProperty();
     /**
-     * 公司
+     * 公司ID
      */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 最后更新日期
      */
@@ -47,35 +42,28 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYu> {
     private SimpleObjectProperty<LocalDateTime> cloudLatest = new SimpleObjectProperty<>();
 
     @Override
-    protected void updateFrom(CloudYu info) {
+    protected void updateFrom(CloudYuVo info) {
         super.updateFrom(info);
-        update_((CloudYu) info);
+        update_((CloudYuVo) info);
     }
 
-    private void update_(CloudYu info) {
+    private void update_(CloudYuVo info) {
         vendorCode.set(info.getExceptionMessage());
         vendorDevelopDate.set(info.getVendorUpdateDate());
         customerDevelopDate.set(info.getCustomerUpdateDate());
-        if (info.getCloudLatest() != null) {
-            ZoneId zone = ZoneId.systemDefault();
-            ZonedDateTime zonedDateTime = info.getCloudLatest().atZone(zone);
-            LocalDateTime localDateTime = zonedDateTime.toLocalDateTime();
-            cloudLatest.set(localDateTime);
-        } else {
-            cloudLatest.set(null);
-        }
+        cloudLatest.set(info.getCloudLatest());
     }
 
     @Override
-    public boolean copyTo(CloudYu info) {
+    public boolean copyTo(CloudYuVo info) {
         boolean modified = super.copyTo(info);
-        if (copyTo_((CloudYu) info)) {
+        if (copyTo_((CloudYuVo) info)) {
             modified = true;
         }
         return modified;
     }
 
-    private boolean copyTo_(CloudYu info) {
+    private boolean copyTo_(CloudYuVo info) {
         boolean modified = false;
         if (!Objects.equals(info.getExceptionMessage(), vendorCode.get())) {
             info.setExceptionMessage(vendorCode.get());
@@ -90,20 +78,18 @@ public class CloudYuInfoViewModel extends IdentityViewModel<CloudYu> {
             modified = true;
         }
 
-        Instant latest = MyDateTimePropertyUtils.localDateTimeToInstant(cloudLatest);
-        if (!Objects.equals(info.getCloudLatest(), latest)) {
-            info.setCloudLatest(latest);
+        if (!Objects.equals(info.getCloudLatest(), cloudLatest.get())) {
+            info.setCloudLatest(cloudLatest.get());
             modified = true;
         }
 
         return modified;
     }
 
-    public static CloudYuInfoViewModel from(CloudYu cc) {
+    public static CloudYuInfoViewModel from(CloudYuVo cc) {
         CloudYuInfoViewModel model = new CloudYuInfoViewModel();
         model.update(cc);
         return model;
     }
 
-
 }

client/src/main/java/com/ecep/contract/vm/CompanyBlackReasonViewModel.java

@@ -4,7 +4,7 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.BlackReasonType;
-import com.ecep.contract.model.CompanyBlackReason;
+import com.ecep.contract.vo.CompanyBlackReasonVo;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -16,7 +16,7 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ToString
-public class CompanyBlackReasonViewModel extends IdentityViewModel<CompanyBlackReason> {
+public class CompanyBlackReasonViewModel extends IdentityViewModel<CompanyBlackReasonVo> {
     private SimpleIntegerProperty id = new SimpleIntegerProperty();
     private SimpleObjectProperty<BlackReasonType> type = new SimpleObjectProperty<>();
 
@@ -31,14 +31,14 @@ public class CompanyBlackReasonViewModel extends IdentityViewModel<CompanyBlackR
     private SimpleObjectProperty<LocalDate> includeDate = new SimpleObjectProperty<>();
 
 
-    public static CompanyBlackReasonViewModel from(CompanyBlackReason reason) {
+    public static CompanyBlackReasonViewModel from(CompanyBlackReasonVo reason) {
         CompanyBlackReasonViewModel model = new CompanyBlackReasonViewModel();
         model.update(reason);
         return model;
     }
 
     @Override
-    protected void updateFrom(CompanyBlackReason v) {
+    protected void updateFrom(CompanyBlackReasonVo v) {
         getId().set(v.getId());
         getType().set(v.getType());
         getApplyName().set(v.getApplyName());
@@ -52,7 +52,7 @@ public class CompanyBlackReasonViewModel extends IdentityViewModel<CompanyBlackR
     }
 
     @Override
-    public boolean copyTo(CompanyBlackReason v) {
+    public boolean copyTo(CompanyBlackReasonVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(id.get(), v.getId())) {
             v.setId(id.get());

client/src/main/java/com/ecep/contract/vm/CompanyContactViewModel.java

@@ -4,6 +4,7 @@ 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;
@@ -13,7 +14,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyContactViewModel extends IdentityViewModel<CompanyContact> {
+public class CompanyContactViewModel extends IdentityViewModel<CompanyContactVo> {
     private SimpleIntegerProperty id = new SimpleIntegerProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty position = new SimpleStringProperty();
@@ -25,14 +26,14 @@ public class CompanyContactViewModel extends IdentityViewModel<CompanyContact> {
     private SimpleIntegerProperty version = new SimpleIntegerProperty();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    public static CompanyContactViewModel from(CompanyContact contact) {
+    public static CompanyContactViewModel from(CompanyContactVo contact) {
         CompanyContactViewModel model = new CompanyContactViewModel();
         model.update(contact);
         return model;
     }
 
 
-    public void updateFrom(CompanyContact v) {
+    public void updateFrom(CompanyContactVo v) {
         id.set(v.getId());
         name.set(v.getName());
         position.set(v.getPosition());
@@ -45,7 +46,7 @@ public class CompanyContactViewModel extends IdentityViewModel<CompanyContact> {
         version.set(v.getVersion());
     }
 
-    public boolean copyTo(CompanyContact v) {
+    public boolean copyTo(CompanyContactVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(id.get(), v.getId())) {
             v.setId(id.get());

client/src/main/java/com/ecep/contract/vm/CompanyCustomerEvaluationFormFileViewModel.java

@@ -0,0 +1,115 @@
+package com.ecep.contract.vm;
+
+import java.util.Objects;
+
+import com.ecep.contract.vo.CompanyCustomerEvaluationFormFileVo;
+
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CompanyCustomerEvaluationFormFileViewModel extends IdentityViewModel<CompanyCustomerEvaluationFormFileVo> {
+    
+    private SimpleIntegerProperty customerFile = new SimpleIntegerProperty();
+    private SimpleStringProperty catalog = new SimpleStringProperty();
+    private SimpleStringProperty level = new SimpleStringProperty();
+    private SimpleIntegerProperty creditLevel = new SimpleIntegerProperty(0);
+    private SimpleIntegerProperty score1 = new SimpleIntegerProperty(0);
+    private SimpleIntegerProperty score2 = new SimpleIntegerProperty(0);
+    private SimpleIntegerProperty score3 = new SimpleIntegerProperty(0);
+    private SimpleIntegerProperty score4 = new SimpleIntegerProperty(0);
+    private SimpleIntegerProperty score5 = new SimpleIntegerProperty(0);
+    private SimpleIntegerProperty scoreTemplateVersion = new SimpleIntegerProperty(1);
+
+    private SimpleStringProperty filePath = new SimpleStringProperty();
+    
+    public static CompanyCustomerEvaluationFormFileViewModel from(CompanyCustomerEvaluationFormFileVo vo) {
+        CompanyCustomerEvaluationFormFileViewModel viewModel = new CompanyCustomerEvaluationFormFileViewModel();
+        viewModel.update(vo);
+        return viewModel;
+    }
+    
+    @Override
+    protected void updateFrom(CompanyCustomerEvaluationFormFileVo vo) {
+        super.updateFrom(vo);
+        if (vo.getCustomerFile() != null) {
+            customerFile.set(vo.getCustomerFile());
+        }
+        if (vo.getCatalog() != null) {
+            catalog.set(vo.getCatalog());
+        }
+        if (vo.getLevel() != null) {
+            level.set(vo.getLevel());
+        }
+        if (vo.getCreditLevel() != null) {
+            creditLevel.set(vo.getCreditLevel());
+        }
+        if (vo.getScore1() != null) {
+            score1.set(vo.getScore1());
+        }
+        if (vo.getScore2() != null) {
+            score2.set(vo.getScore2());
+        }
+        if (vo.getScore3() != null) {
+            score3.set(vo.getScore3());
+        }
+        if (vo.getScore4() != null) {
+            score4.set(vo.getScore4());
+        }
+        if (vo.getScore5() != null) {
+            score5.set(vo.getScore5());
+        }
+        if (vo.getScoreTemplateVersion() != null) {
+            scoreTemplateVersion.set(vo.getScoreTemplateVersion());
+        }
+    }
+    
+    @Override
+    public boolean copyTo(CompanyCustomerEvaluationFormFileVo vo) {
+        boolean changed = super.copyTo(vo);
+        if (!Objects.equals(customerFile.get(), vo.getCustomerFile())) {
+            vo.setCustomerFile(customerFile.get());
+            changed = true;
+        }
+        if (!Objects.equals(catalog.get(), vo.getCatalog())) {
+            vo.setCatalog(catalog.get());
+            changed = true;
+        }
+        if (!Objects.equals(level.get(), vo.getLevel())) {
+            vo.setLevel(level.get());
+            changed = true;
+        }
+        if (!Objects.equals(creditLevel.get(), vo.getCreditLevel())) {
+            vo.setCreditLevel(creditLevel.get());
+            changed = true;
+        }
+        if (!Objects.equals(score1.get(), vo.getScore1())) {
+            vo.setScore1(score1.get());
+            changed = true;
+        }
+        if (!Objects.equals(score2.get(), vo.getScore2())) {
+            vo.setScore2(score2.get());
+            changed = true;
+        }
+        if (!Objects.equals(score3.get(), vo.getScore3())) {
+            vo.setScore3(score3.get());
+            changed = true;
+        }
+        if (!Objects.equals(score4.get(), vo.getScore4())) {
+            vo.setScore4(score4.get());
+            changed = true;
+        }
+        if (!Objects.equals(score5.get(), vo.getScore5())) {
+            vo.setScore5(score5.get());
+            changed = true;
+        }
+        if (!Objects.equals(scoreTemplateVersion.get(), vo.getScoreTemplateVersion())) {
+            vo.setScoreTemplateVersion(scoreTemplateVersion.get());
+            changed = true;
+        }
+        return changed;
+    }
+}

client/src/main/java/com/ecep/contract/vm/CompanyCustomerFileViewModel.java

@@ -4,8 +4,7 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.CompanyCustomerFileType;
-import com.ecep.contract.model.CompanyCustomer;
-import com.ecep.contract.model.CompanyCustomerFile;
+import com.ecep.contract.vo.CompanyCustomerFileVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -17,17 +16,22 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ToString
-public class CompanyCustomerFileViewModel extends IdentityViewModel<CompanyCustomerFile> {
+public class CompanyCustomerFileViewModel extends IdentityViewModel<CompanyCustomerFileVo> {
 
-    public static CompanyCustomerFileViewModel from(CompanyCustomerFile companyCustomerFile) {
+    public static CompanyCustomerFileViewModel from(CompanyCustomerFileVo companyCustomerFile) {
         CompanyCustomerFileViewModel model = new CompanyCustomerFileViewModel();
         model.update(companyCustomerFile);
         return model;
     }
 
+    /**
+     * CompanyCustomer
+     */
     @ToString.Exclude
-    private SimpleObjectProperty<CompanyCustomer> customer = new SimpleObjectProperty<>();
-
+    private SimpleObjectProperty<Integer> customer = new SimpleObjectProperty<>();
+    /**
+     * 类型
+     */
     private SimpleObjectProperty<CompanyCustomerFileType> type = new SimpleObjectProperty<>();
 
     private SimpleStringProperty filePath = new SimpleStringProperty();
@@ -39,9 +43,8 @@ public class CompanyCustomerFileViewModel extends IdentityViewModel<CompanyCusto
     @ToString.Exclude
     private SimpleBooleanProperty valid = new SimpleBooleanProperty(this, "valid", false);
 
-
     @Override
-    protected void updateFrom(CompanyCustomerFile v) {
+    protected void updateFrom(CompanyCustomerFileVo v) {
         super.updateFrom(v);
         getCustomer().set(v.getCustomer());
         getType().set(v.getType());
@@ -53,7 +56,7 @@ public class CompanyCustomerFileViewModel extends IdentityViewModel<CompanyCusto
     }
 
     @Override
-    public boolean copyTo(CompanyCustomerFile v) {
+    public boolean copyTo(CompanyCustomerFileVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(customer.get(), v.getCustomer())) {
             v.setCustomer(customer.get());

client/src/main/java/com/ecep/contract/vm/CompanyCustomerViewModel.java

@@ -1,16 +1,10 @@
 package com.ecep.contract.vm;
 
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.ZoneId;
-import java.time.ZoneOffset;
-import java.time.ZonedDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.CompanyContact;
-import com.ecep.contract.model.CompanyCustomer;
+import com.ecep.contract.vo.CompanyCustomerVo;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -20,12 +14,12 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyCustomerViewModel extends IdentityViewModel<CompanyCustomer> {
+public class CompanyCustomerViewModel extends IdentityViewModel<CompanyCustomerVo> {
     private SimpleStringProperty state = new SimpleStringProperty();
     /**
-     * 关联的企业
+     * 关联的企业,Company
      */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 发展日期
      */
@@ -35,47 +29,39 @@ public class CompanyCustomerViewModel extends IdentityViewModel<CompanyCustomer>
      */
     private SimpleStringProperty path = new SimpleStringProperty();
     /**
-     * 关联联系人
+     * 关联联系人,CompanyContact
      */
-    private SimpleObjectProperty<CompanyContact> contact = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> contact = new SimpleObjectProperty<>();
 
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleObjectProperty<LocalDateTime> created = new SimpleObjectProperty<>();
     private SimpleIntegerProperty version = new SimpleIntegerProperty();
 
-    public static CompanyCustomerViewModel from(CompanyCustomer cc) {
+    public static CompanyCustomerViewModel from(CompanyCustomerVo cc) {
         CompanyCustomerViewModel model = new CompanyCustomerViewModel();
         model.update(cc);
         return model;
     }
 
-    public void updateFrom(CompanyCustomer c) {
+    public void updateFrom(CompanyCustomerVo c) {
         super.updateFrom(c);
-        getCompany().set(c.getCompany());
+        getCompany().set(c.getCompanyId());
         getDevelopDate().set(c.getDevelopDate());
-        getContact().set(c.getContact());
+        getContact().set(c.getContactId());
         getPath().set(c.getPath());
         getDescription().set(c.getDescription());
-
-        if (c.getCreated() != null) {
-            ZoneId zone = ZoneId.systemDefault();
-            ZonedDateTime zonedDateTime = c.getCreated().atZone(zone);
-            LocalDateTime localDateTime = zonedDateTime.toLocalDateTime();
-            getCreated().set(localDateTime);
-        } else {
-            getCreated().set(null);
-        }
+        getCreated().set(c.getCreated());
         version.set(c.getVersion());
     }
 
-    public boolean copyTo(CompanyCustomer v) {
+    public boolean copyTo(CompanyCustomerVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(company.get(), v.getCompanyId())) {
+            v.setCompanyId(company.get());
             modified = true;
         }
-        if (!Objects.equals(contact.get(), v.getContact())) {
-            v.setContact(contact.get());
+        if (!Objects.equals(contact.get(), v.getContactId())) {
+            v.setContactId(contact.get());
             modified = true;
         }
         if (!Objects.equals(developDate.get(), v.getDevelopDate())) {
@@ -90,17 +76,12 @@ public class CompanyCustomerViewModel extends IdentityViewModel<CompanyCustomer>
             v.setDescription(description.get());
             modified = true;
         }
-        if (created.get() == null) {
-            v.setCreated(null);
-        } else {
-            Instant instant = created.get().toInstant(ZoneOffset.ofHours(8));
-            if (!Objects.equals(instant, v.getCreated())) {
-                v.setCreated(instant);
-                modified = true;
-            }
+
+        if (!Objects.equals(created.get(), v.getCreated())) {
+            v.setCreated(created.get());
+            modified = true;
         }
+
         return modified;
     }
 }
-
-

client/src/main/java/com/ecep/contract/vm/CompanyExtendInfoViewModel.java

@@ -2,8 +2,9 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Company;
 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;
@@ -13,36 +14,36 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyExtendInfoViewModel extends IdentityViewModel<CompanyExtendInfo> {
+public class CompanyExtendInfoViewModel extends IdentityViewModel<CompanyExtendInfoVo> {
     /**
      * 关联的公司
      */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 是否禁用核验
      */
     private SimpleBooleanProperty disableVerify = new SimpleBooleanProperty();
     private SimpleIntegerProperty version = new SimpleIntegerProperty();
 
-    public static CompanyExtendInfoViewModel from(CompanyExtendInfo v) {
+    public static CompanyExtendInfoViewModel from(CompanyExtendInfoVo v) {
         CompanyExtendInfoViewModel vm = new CompanyExtendInfoViewModel();
         vm.updateFrom(v);
         return vm;
     }
 
     @Override
-    protected void updateFrom(CompanyExtendInfo v) {
+    protected void updateFrom(CompanyExtendInfoVo v) {
         super.updateFrom(v);
-        getCompany().set(v.getCompany());
+        getCompany().set(v.getCompanyId());
         getDisableVerify().set(v.isDisableVerify());
         getVersion().set(v.getVersion());
     }
 
     @Override
-    public boolean copyTo(CompanyExtendInfo v) {
+    public boolean copyTo(CompanyExtendInfoVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(company.get(), v.getCompanyId())) {
+            v.setCompanyId(company.get());
             modified = true;
         }
         if (!Objects.equals(disableVerify.get(), v.isDisableVerify())) {

client/src/main/java/com/ecep/contract/vm/CompanyFileViewModel.java

@@ -4,10 +4,9 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.CompanyFileType;
-import com.ecep.contract.model.Company;
 import com.ecep.contract.model.CompanyFile;
+import com.ecep.contract.vo.CompanyFileVo;
 
-import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
@@ -18,28 +17,27 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyFileViewModel extends IdentityViewModel<CompanyFile> {
-    SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+public class CompanyFileViewModel extends IdentityViewModel<CompanyFileVo> {
+    SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     SimpleObjectProperty<CompanyFileType> type = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> applyDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> expiringDate = new SimpleObjectProperty<>();
     SimpleStringProperty filePath = new SimpleStringProperty();
 
-
     @Override
-    protected void updateFrom(CompanyFile v) {
+    protected void updateFrom(CompanyFileVo v) {
         super.updateFrom(v);
-        company.set(v.getCompany());
+        company.set(v.getCompanyId());
         type.set(v.getType());
         applyDate.set(v.getApplyDate());
         expiringDate.set(v.getExpiringDate());
         filePath.set(v.getFilePath());
     }
 
-    public boolean copyTo(CompanyFile v) {
+    public boolean copyTo(CompanyFileVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(company.get(), v.getCompanyId())) {
+            v.setCompanyId(company.get());
             modified = true;
         }
 
@@ -63,7 +61,7 @@ public class CompanyFileViewModel extends IdentityViewModel<CompanyFile> {
         return modified;
     }
 
-    public static CompanyFileViewModel from(CompanyFile file) {
+    public static CompanyFileViewModel from(CompanyFileVo file) {
         CompanyFileViewModel model = new CompanyFileViewModel();
         model.update(file);
         return model;

client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedFileViewModel.java

@@ -3,8 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.CompanyVendorApprovedFile;
-import com.ecep.contract.model.CompanyVendorApprovedList;
+import com.ecep.contract.vo.CompanyVendorApprovedFileVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -15,16 +14,19 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ToString
-public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<CompanyVendorApprovedFile> {
+public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<CompanyVendorApprovedFileVo> {
 
-    public static CompanyVendorApprovedFileViewModel from(CompanyVendorApprovedFile companyVendorApprovedItemFile) {
+    public static CompanyVendorApprovedFileViewModel from(CompanyVendorApprovedFileVo companyVendorApprovedItemFile) {
         CompanyVendorApprovedFileViewModel viewModel = new CompanyVendorApprovedFileViewModel();
         viewModel.update(companyVendorApprovedItemFile);
         return viewModel;
     }
 
+    /**
+     * CompanyVendorApprovedList
+     */
     @ToString.Exclude
-    private SimpleObjectProperty<CompanyVendorApprovedList> list = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> list = new SimpleObjectProperty<>();
 
     private SimpleStringProperty fileName = new SimpleStringProperty();
 
@@ -33,19 +35,19 @@ public class CompanyVendorApprovedFileViewModel extends IdentityViewModel<Compan
     private SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(CompanyVendorApprovedFile v) {
+    protected void updateFrom(CompanyVendorApprovedFileVo v) {
         super.updateFrom(v);
-        getList().set(v.getList());
+        getList().set(v.getListId());
         getFileName().set(v.getFileName());
         getSignDate().set(v.getSignDate());
         getDescription().set(v.getDescription());
     }
 
     @Override
-    public boolean copyTo(CompanyVendorApprovedFile v) {
+    public boolean copyTo(CompanyVendorApprovedFileVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(list.get(), v.getList())) {
-            v.setList(list.get());
+        if (!Objects.equals(list.get(), v.getListId())) {
+            v.setListId(list.get());
             modified = true;
         }
         if (!Objects.equals(fileName.get(), v.getFileName())) {

client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedItemViewModel.java

@@ -4,8 +4,8 @@ import java.util.Objects;
 
 import com.ecep.contract.VendorType;
 import com.ecep.contract.model.CompanyVendor;
-import com.ecep.contract.model.CompanyVendorApprovedItem;
-import com.ecep.contract.model.CompanyVendorApprovedList;
+import com.ecep.contract.vo.CompanyVendorApprovedItemVo;
+import com.ecep.contract.vo.CompanyVendorApprovedListVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -14,44 +14,45 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<CompanyVendorApprovedItem> {
-    public static CompanyVendorApprovedItemViewModel from(CompanyVendorApprovedItem item) {
+public class CompanyVendorApprovedItemViewModel extends IdentityViewModel<CompanyVendorApprovedItemVo> {
+    public static CompanyVendorApprovedItemViewModel from(CompanyVendorApprovedItemVo item) {
         CompanyVendorApprovedItemViewModel model = new CompanyVendorApprovedItemViewModel();
         model.update(item);
         return model;
     }
 
-
-    private SimpleObjectProperty<CompanyVendorApprovedList> list = new SimpleObjectProperty<>();
+    /**
+     * CompanyVendorApprovedListVo
+     */
+    private SimpleObjectProperty<Integer> list = new SimpleObjectProperty<>();
     private SimpleStringProperty vendorName = new SimpleStringProperty();
-    private SimpleObjectProperty<CompanyVendor> vendor = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> vendor = new SimpleObjectProperty<>();
     private SimpleObjectProperty<VendorType> type = new SimpleObjectProperty<>();
     private SimpleStringProperty description = new SimpleStringProperty();
 
-
     @Override
-    protected void updateFrom(CompanyVendorApprovedItem v) {
+    protected void updateFrom(CompanyVendorApprovedItemVo v) {
         super.updateFrom(v);
+        getList().set(v.getListId());
         getVendorName().set(v.getVendorName());
-        getList().set(v.getList());
-        getVendor().set(v.getVendor());
+        getVendor().set(v.getVendorId());
         getType().set(v.getType());
         getDescription().set(v.getDescription());
     }
 
     @Override
-    public boolean copyTo(CompanyVendorApprovedItem v) {
+    public boolean copyTo(CompanyVendorApprovedItemVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(vendorName.get(), v.getVendorName())) {
             v.setVendorName(vendorName.get());
             modified = true;
         }
-        if (!Objects.equals(list.get(), v.getList())) {
-            v.setList(list.get());
+        if (!Objects.equals(list.get(), v.getListId())) {
+            v.setListId(list.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(type.get(), v.getType())) {

client/src/main/java/com/ecep/contract/vm/CompanyVendorApprovedListViewModel.java

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.CompanyVendorApprovedList;
+import com.ecep.contract.vo.CompanyVendorApprovedListVo;
 
 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<CompanyVendorApprovedList> {
+        extends IdentityViewModel<CompanyVendorApprovedListVo> {
     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(CompanyVendorApprovedList list) {
+    public static CompanyVendorApprovedListViewModel from(CompanyVendorApprovedListVo list) {
         CompanyVendorApprovedListViewModel model = new CompanyVendorApprovedListViewModel();
         model.update(list);
         return model;
     }
 
     @Override
-    protected void updateFrom(CompanyVendorApprovedList v) {
+    protected void updateFrom(CompanyVendorApprovedListVo v) {
         super.updateFrom(v);
         getTitle().set(v.getTitle());
         getPublishDate().set(v.getPublishDate());
@@ -35,7 +35,7 @@ public class CompanyVendorApprovedListViewModel
     }
 
     @Override
-    public boolean copyTo(CompanyVendorApprovedList v) {
+    public boolean copyTo(CompanyVendorApprovedListVo v) {
         boolean modified = super.copyTo(v);
 
         if (!Objects.equals(title.get(), v.getTitle())) {

client/src/main/java/com/ecep/contract/vm/CompanyVendorEntityViewModel.java

@@ -3,10 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 
-import com.ecep.contract.model.CompanyVendor;
-import com.ecep.contract.model.CompanyVendorEntity;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.VendorCatalog;
+import com.ecep.contract.vo.CompanyVendorEntityVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import lombok.Data;
@@ -14,42 +11,50 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendorEntity> {
-    private SimpleObjectProperty<CompanyVendor> vendor = new SimpleObjectProperty<>();
+public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendorEntityVo> {
+    private SimpleObjectProperty<Integer> vendorId = new SimpleObjectProperty<>();
     private SimpleObjectProperty<String> name = new SimpleObjectProperty<>();
     private SimpleObjectProperty<String> abbName = new SimpleObjectProperty<>();
     private SimpleObjectProperty<String> code = new SimpleObjectProperty<>();
 
-    private SimpleObjectProperty<VendorCatalog> catalog = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Employee> creator = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> catalogId = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> creatorId = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> developDate = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Employee> modifier = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> modifierId = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> modifyDate = new SimpleObjectProperty<>();
 
     private SimpleObjectProperty<LocalDate> updatedDate = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDateTime> fetchedTime = new SimpleObjectProperty<>();
 
     @Override
-    protected void updateFrom(CompanyVendorEntity v) {
+    protected void updateFrom(CompanyVendorEntityVo v) {
         super.updateFrom(v);
-        vendor.set(v.getVendor());
+        if (v.getVendorId() != null) {
+            vendorId.set(v.getVendorId());
+        }
         name.set(v.getName());
         abbName.set(v.getAbbName());
         code.set(v.getCode());
-        catalog.set(v.getCatalog());
-        creator.set(v.getCreator());
+        if (v.getCatalogId() != null) {
+            catalogId.set(v.getCatalogId());
+        }
+        if (v.getCreatorId() != null) {
+            creatorId.set(v.getCreatorId());
+        }
         developDate.set(v.getDevelopDate());
-        modifier.set(v.getModifier());
+        if (v.getModifierId() != null) {
+            modifierId.set(v.getModifierId());
+        }
         modifyDate.set(v.getModifyDate());
         updatedDate.set(v.getUpdatedDate());
         fetchedTime.set(v.getFetchedTime());
     }
 
     @Override
-    public boolean copyTo(CompanyVendorEntity v) {
+    public boolean copyTo(CompanyVendorEntityVo v) {
         boolean modified = super.copyTo(v);
-        if (vendor.get() != null) {
-            v.setVendor(vendor.get());
+        if (vendorId.get() != 0) {
+            v.setVendorId(vendorId.get());
             modified = true;
         }
         if (name.get() != null) {
@@ -64,20 +69,32 @@ public class CompanyVendorEntityViewModel extends IdentityViewModel<CompanyVendo
             v.setCode(code.get());
             modified = true;
         }
-        if (catalog.get() != null) {
-            v.setCatalog(catalog.get());
+        if (catalogId.get() != 0) {
+            v.setCatalogId(catalogId.get());
             modified = true;
         }
-        if (creator.get() != null) {
-            v.setCreator(creator.get());
+        if (creatorId.get() != 0) {
+            v.setCreatorId(creatorId.get());
             modified = true;
         }
         if (developDate.get() != null) {
             v.setDevelopDate(developDate.get());
             modified = true;
         }
-        if (modifier.get() != null) {
-            v.setModifier(modifier.get());
+        if (modifierId.get() != 0) {
+            v.setModifierId(modifierId.get());
+            modified = true;
+        }
+        if (modifyDate.get() != null) {
+            v.setModifyDate(modifyDate.get());
+            modified = true;
+        }
+        if (updatedDate.get() != null) {
+            v.setUpdatedDate(updatedDate.get());
+            modified = true;
+        }
+        if (fetchedTime.get() != null) {
+            v.setFetchedTime(fetchedTime.get());
             modified = true;
         }
 

client/src/main/java/com/ecep/contract/vm/CompanyVendorFileViewModel.java

@@ -4,8 +4,7 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.VendorFileType;
-import com.ecep.contract.model.CompanyVendor;
-import com.ecep.contract.model.CompanyVendorFile;
+import com.ecep.contract.vo.CompanyVendorFileVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -17,9 +16,12 @@ import lombok.ToString;
 @Data
 @EqualsAndHashCode(callSuper = false)
 @ToString
-public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorFile> {
+public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorFileVo> {
+    /**
+     * 
+     */
     @ToString.Exclude
-    private SimpleObjectProperty<CompanyVendor> vendor = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> vendor = new SimpleObjectProperty<>();
 
     private SimpleObjectProperty<VendorFileType> type = new SimpleObjectProperty<>();
 
@@ -32,11 +34,10 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
     @ToString.Exclude
     private SimpleBooleanProperty valid = new SimpleBooleanProperty(this, "valid", false);
 
-
     @Override
-    protected void updateFrom(CompanyVendorFile v) {
+    protected void updateFrom(CompanyVendorFileVo v) {
         super.updateFrom(v);
-        getVendor().set(v.getVendor());
+        getVendor().set(v.getVendorId());
         getType().set(v.getType());
         getFilePath().set(v.getFilePath());
         getEditFilePath().set(v.getEditFilePath());
@@ -46,10 +47,10 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
     }
 
     @Override
-    public boolean copyTo(CompanyVendorFile v) {
+    public boolean copyTo(CompanyVendorFileVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(getVendor().get(), v.getVendor())) {
-            v.setVendor(getVendor().get());
+        if (!Objects.equals(getVendor().get(), v.getVendorId())) {
+            v.setVendorId(getVendor().get());
             modified = true;
         }
         if (!Objects.equals(getType().get(), v.getType())) {
@@ -75,7 +76,7 @@ public class CompanyVendorFileViewModel extends IdentityViewModel<CompanyVendorF
         return modified;
     }
 
-    public static CompanyVendorFileViewModel from(CompanyVendorFile companyVendorFile) {
+    public static CompanyVendorFileViewModel from(CompanyVendorFileVo companyVendorFile) {
         CompanyVendorFileViewModel model = new CompanyVendorFileViewModel();
         model.update(companyVendorFile);
         return model;

client/src/main/java/com/ecep/contract/vm/CompanyVendorViewModel.java

@@ -1,19 +1,13 @@
 package com.ecep.contract.vm;
 
-import java.time.Instant;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
-import java.time.ZoneOffset;
 import java.time.ZonedDateTime;
 import java.util.Objects;
 
 import com.ecep.contract.VendorType;
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.CompanyContact;
-import com.ecep.contract.model.CompanyVendor;
-import com.ecep.contract.model.VendorCatalog;
-import com.ecep.contract.model.VendorGroup;
+import com.ecep.contract.vo.CompanyVendorVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -24,7 +18,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
+public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendorVo> {
 
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty state = new SimpleStringProperty();
@@ -33,21 +27,21 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
      */
     private SimpleObjectProperty<VendorType> type = new SimpleObjectProperty<>();
     /**
-     * 分组
+     * 分组, VendorGroup
      */
-    private SimpleObjectProperty<VendorGroup> group = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> group = new SimpleObjectProperty<>();
     /**
      * 是否为协议供应商
      */
     private SimpleBooleanProperty protocolProvider = new SimpleBooleanProperty(false);
     /**
-     * 分组
+     * 分组，VendorGroup
      */
-    private SimpleObjectProperty<VendorCatalog> catalog = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> catalog = new SimpleObjectProperty<>();
     /**
-     * 关联的企业
+     * 关联的企业，Company
      */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 开发日期
      */
@@ -55,7 +49,7 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
     /**
      * 对口联系人
      */
-    private SimpleObjectProperty<CompanyContact> contact = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> contact = new SimpleObjectProperty<>();
     /**
      * 文件夹
      */
@@ -74,20 +68,19 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
     private SimpleObjectProperty<LocalDateTime> created = new SimpleObjectProperty<>();
     private SimpleIntegerProperty version = new SimpleIntegerProperty();
 
-
-    public static CompanyVendorViewModel from(CompanyVendor companyVendor) {
+    public static CompanyVendorViewModel from(CompanyVendorVo companyVendor) {
         CompanyVendorViewModel model = new CompanyVendorViewModel();
         model.update(companyVendor);
         return model;
     }
 
-    public void updateFrom(CompanyVendor v) {
+    public void updateFrom(CompanyVendorVo v) {
         super.updateFrom(v);
-//        getState().set(v.getState());
+        // getState().set(v.getState());
         getType().set(v.getType());
         getProtocolProvider().set(v.isProtocolProvider());
-        getCatalog().set(v.getCatalog());
-        getCompany().set(v.getCompany());
+        getCatalog().set(v.getCatalogId());
+        getCompany().set(v.getCompanyId());
         getDevelopDate().set(v.getDevelopDate());
 
         getPath().set(v.getPath());
@@ -103,11 +96,11 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
             getCreated().set(null);
         }
 
-        getContact().set(v.getContact());
+        getContact().set(v.getContactId());
         version.set(v.getVersion());
     }
 
-    public boolean copyTo(CompanyVendor v) {
+    public boolean copyTo(CompanyVendorVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(type.get(), v.getType())) {
             v.setType(type.get());
@@ -118,13 +111,13 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
             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(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(company.get(), v.getCompanyId())) {
+            v.setCompanyId(company.get());
             modified = true;
         }
 
@@ -148,20 +141,14 @@ public class CompanyVendorViewModel extends IdentityViewModel<CompanyVendor> {
             modified = true;
         }
 
-
-        if (!Objects.equals(contact.get(), v.getContact())) {
-            v.setContact(contact.get());
+        if (!Objects.equals(contact.get(), v.getContactId())) {
+            v.setContactId(contact.get());
             modified = true;
         }
 
-        if (created.get() == null) {
-            v.setCreated(null);
-        } else {
-            Instant instant = created.get().toInstant(ZoneOffset.ofHours(8));
-            if (!Objects.equals(instant, v.getCreated())) {
-                v.setCreated(instant);
-                modified = true;
-            }
+        if (!Objects.equals(created.get(), v.getCreated())) {
+            v.setCreated(created.get());
+            modified = true;
         }
         return modified;
     }

client/src/main/java/com/ecep/contract/vm/CompanyViewModel.java

@@ -53,9 +53,7 @@ public class CompanyViewModel extends IdentityViewModel<CompanyVo> {
         name.set(company.getName());
         shortName.set(company.getShortName());
         uid.set(company.getUniscid());
-        if (company.getPathExist() != null) {
-            pathExist.set(company.getPathExist());
-        }
+        pathExist.set(company.isPathExist());
         path.set(company.getPath());
         setupDate.set(company.getSetupDate());
         entStatus.set(company.getEntStatus());
@@ -93,7 +91,7 @@ public class CompanyViewModel extends IdentityViewModel<CompanyVo> {
             modified = true;
         }
 
-        if (!Objects.equals(pathExist.get(), v.getPathExist())) {
+        if (!Objects.equals(pathExist.get(), v.isPathExist())) {
             v.setPathExist(pathExist.get());
             modified = true;
         }

client/src/main/java/com/ecep/contract/vm/ContractBidVendorViewModel.java

@@ -2,63 +2,55 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.ContractBidVendor;
-import com.ecep.contract.model.ContractFile;
+import com.ecep.contract.vo.ContractBidVendorVo;
 
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleIntegerProperty;
+import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractBidVendorViewModel extends IdentityViewModel<ContractBidVendor> {
-    /**
-     * 关联的合同
-     */
-    private SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
-    /**
-     * 关联的企业
-     */
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
-    /**
-     *
-     */
-    private SimpleObjectProperty<ContractFile> quotationSheet = new SimpleObjectProperty<>();
+public class ContractBidVendorViewModel extends IdentityViewModel<ContractBidVendorVo> {
+    private SimpleIntegerProperty contractId = new SimpleIntegerProperty();
+    private SimpleIntegerProperty companyId = new SimpleIntegerProperty();
+    private SimpleIntegerProperty quotationSheetFileId = new SimpleIntegerProperty();
+    private SimpleStringProperty quotationSheetFileName = new SimpleStringProperty();
 
-
-    @Override
-    protected void updateFrom(ContractBidVendor v) {
-        super.updateFrom(v);
-        getContract().set(v.getContract());
-        getCompany().set(v.getCompany());
-        getQuotationSheet().set(v.getQuotationSheet());
+    public static ContractBidVendorViewModel from(ContractBidVendorVo v) {
+        ContractBidVendorViewModel vm = new ContractBidVendorViewModel();
+        vm.update(v);
+        return vm;
     }
 
     @Override
-    public boolean copyTo(ContractBidVendor v) {
-        boolean modified = super.copyTo(v);
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
-            modified = true;
-        }
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
-            modified = true;
-        }
-        if (!Objects.equals(quotationSheet.get(), v.getQuotationSheet())) {
-            v.setQuotationSheet(quotationSheet.get());
-            modified = true;
-        }
+    protected void updateFrom(ContractBidVendorVo v) {
+        super.updateFrom(v);
+        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
+    public boolean copyTo(ContractBidVendorVo v) {
+        boolean modified = super.copyTo(v);
+        if (getContractId().get() != v.getContractId()) {
+            v.setContractId(getContractId().get() != 0 ? getContractId().get() : null);
+            modified = true;
+        }
+        if (getCompanyId().get() != v.getCompanyId()) {
+            v.setCompanyId(getCompanyId().get() != 0 ? getCompanyId().get() : null);
+            modified = true;
+        }
+        if (getQuotationSheetFileId().get() != v.getQuotationSheetFileId()) {
+            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;
     }
-
-    public static ContractBidVendorViewModel from(ContractBidVendor contractBidVendor) {
-        ContractBidVendorViewModel viewModel = new ContractBidVendorViewModel();
-//        viewModel.updateFrom(contractBidVendor);
-        viewModel.update(contractBidVendor);
-        return viewModel;
-    }
 }

client/src/main/java/com/ecep/contract/vm/ContractFileViewModel.java

@@ -4,8 +4,7 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.ContractFileType;
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.ContractFile;
+import com.ecep.contract.vo.ContractFileVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -14,17 +13,20 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractFileViewModel extends IdentityViewModel<ContractFile> {
-    SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
+public class ContractFileViewModel extends IdentityViewModel<ContractFileVo> {
+    /**
+     * Contract
+     */
+    SimpleObjectProperty<Integer> contract = new SimpleObjectProperty<>();
     SimpleObjectProperty<ContractFileType> type = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> applyDate = new SimpleObjectProperty<>();
     SimpleStringProperty fileName = new SimpleStringProperty();
     SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(ContractFile v) {
+    protected void updateFrom(ContractFileVo v) {
         super.updateFrom(v);
-        contract.set(v.getContract());
+        contract.set(v.getContractId());
         type.set(v.getType());
         applyDate.set(v.getApplyDate());
         fileName.set(v.getFileName());
@@ -33,10 +35,10 @@ public class ContractFileViewModel extends IdentityViewModel<ContractFile> {
     }
 
     @Override
-    public boolean copyTo(ContractFile v) {
+    public boolean copyTo(ContractFileVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
+        if (!Objects.equals(contract.get(), v.getContractId())) {
+            v.setContractId(contract.get());
             modified = true;
         }
 
@@ -62,7 +64,7 @@ public class ContractFileViewModel extends IdentityViewModel<ContractFile> {
         return modified;
     }
 
-    public static ContractFileViewModel from(ContractFile contractFile) {
+    public static ContractFileViewModel from(ContractFileVo contractFile) {
         ContractFileViewModel model = new ContractFileViewModel();
         model.update(contractFile);
         return model;

client/src/main/java/com/ecep/contract/vm/ContractGroupViewModel.java

@@ -1,6 +1,6 @@
 package com.ecep.contract.vm;
 
-import com.ecep.contract.model.ContractGroup;
+import com.ecep.contract.vo.ContractGroupVo;
 
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
@@ -8,13 +8,13 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractGroupViewModel extends IdentityViewModel<ContractGroup> {
+public class ContractGroupViewModel extends IdentityViewModel<ContractGroupVo> {
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty title = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(ContractGroup v) {
+    protected void updateFrom(ContractGroupVo v) {
         super.updateFrom(v);
         code.set(v.getCode());
         name.set(v.getName());
@@ -22,7 +22,7 @@ public class ContractGroupViewModel extends IdentityViewModel<ContractGroup> {
     }
 
     @Override
-    public boolean copyTo(ContractGroup v) {
+    public boolean copyTo(ContractGroupVo v) {
         boolean result = super.copyTo(v);
         v.setCode(code.get());
         v.setName(name.get());

client/src/main/java/com/ecep/contract/vm/ContractItemComposeViewModel.java

@@ -1,6 +1,7 @@
 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;
@@ -44,9 +45,9 @@ public class ContractItemComposeViewModel extends BaseViewModel<ContractItemComp
          */
         SimpleDoubleProperty exclusiveTaxAmount = new SimpleDoubleProperty();
 
-        SimpleListProperty<ContractItem> items = new SimpleListProperty<>();
+        SimpleListProperty<ContractItemVo> items = new SimpleListProperty<>();
 
-        public void add(ContractItem item) {
+        public void add(ContractItemVo item) {
             taxRate.set(item.getTaxRate());
             exclusiveTaxPrice.set(item.getExclusiveTaxPrice());
             taxPrice.set(item.getTaxPrice());
@@ -56,7 +57,7 @@ public class ContractItemComposeViewModel extends BaseViewModel<ContractItemComp
 
             quantity.set(quantity.get() + item.getQuantity());
 
-            ObservableList<ContractItem> list = items.get();
+            ObservableList<ContractItemVo> list = items.get();
             if (list == null) {
                 list = FXCollections.observableArrayList();
                 items.set(list);

client/src/main/java/com/ecep/contract/vm/ContractItemViewModel.java

@@ -4,10 +4,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.ContractItem;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Inventory;
+import com.ecep.contract.vo.ContractItemVo;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -20,11 +17,11 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
+public class ContractItemViewModel extends IdentityViewModel<ContractItemVo> {
     /**
-     * 关联的合同对象
+     * 关联的合同对象,Contract
      */
-    SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> contract = new SimpleObjectProperty<>();
     /**
      * 关联的用友系统中的数据ID
      */
@@ -35,9 +32,9 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
     SimpleObjectProperty<String> unit = new SimpleObjectProperty<>();
 
     /**
-     * 存货
+     * 存货,Inventory
      */
-    SimpleObjectProperty<Inventory> inventory = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> inventory = new SimpleObjectProperty<>();
 
     /**
      *
@@ -49,28 +46,32 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
     SimpleDoubleProperty taxAmount = new SimpleDoubleProperty();
     SimpleDoubleProperty exclusiveTaxAmount = new SimpleDoubleProperty();
 
-
     SimpleObjectProperty<LocalDate> startDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> endDate = new SimpleObjectProperty<>();
 
     SimpleObjectProperty<LocalDateTime> createDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> updateDate = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> creator = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> updater = new SimpleObjectProperty<>();
+    /**
+     * 关联的创建人,Employee
+     */
+    SimpleObjectProperty<Integer> creator = new SimpleObjectProperty<>();
+    /**
+     * 关联的更新人,Employee
+     */
+    SimpleObjectProperty<Integer> updater = new SimpleObjectProperty<>();
 
     SimpleObjectProperty<String> remark = new SimpleObjectProperty<>();
 
-
     @Override
-    protected void updateFrom(ContractItem v) {
+    protected void updateFrom(ContractItemVo v) {
         super.updateFrom(v);
-        getContract().set(v.getContract());
+        getContract().set(v.getContractId());
         getRefId().set(v.getRefId());
         getCode().set(v.getItemCode());
         getTitle().set(v.getTitle());
         getSpecification().set(v.getSpecification());
         getUnit().set(v.getUnit());
-        getInventory().set(v.getInventory());
+        getInventory().set(v.getInventoryId());
 
         getExclusiveTaxPrice().set(v.getExclusiveTaxPrice());
         getTaxRate().set(v.getTaxRate());
@@ -82,20 +83,19 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
 
         getCreateDate().set(v.getCreateDate());
         getUpdateDate().set(v.getUpdateDate());
-        getCreator().set(v.getCreator());
-        getUpdater().set(v.getUpdater());
+        getCreator().set(v.getCreatorId());
+        getUpdater().set(v.getUpdaterId());
         getRemark().set(v.getRemark());
 
         getTaxAmount().set(v.getTaxPrice() * v.getQuantity());
         getExclusiveTaxAmount().set(v.getExclusiveTaxPrice() * v.getQuantity());
     }
 
-
     @Override
-    public boolean copyTo(ContractItem v) {
+    public boolean copyTo(ContractItemVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
+        if (!Objects.equals(contract.get(), v.getContractId())) {
+            v.setContractId(contract.get());
             modified = true;
         }
         if (!Objects.equals(refId.get(), v.getRefId())) {
@@ -118,8 +118,8 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
             v.setUnit(unit.get());
             modified = true;
         }
-        if (!Objects.equals(inventory.get(), v.getInventory())) {
-            v.setInventory(inventory.get());
+        if (!Objects.equals(inventory.get(), v.getInventoryId())) {
+            v.setInventoryId(inventory.get());
             modified = true;
         }
         if (!doubleEquals(exclusiveTaxPrice.get(), v.getExclusiveTaxPrice())) {
@@ -156,12 +156,12 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
             v.setUpdateDate(updateDate.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(updater.get(), v.getUpdater())) {
-            v.setUpdater(updater.get());
+        if (!Objects.equals(updater.get(), v.getUpdaterId())) {
+            v.setUpdaterId(updater.get());
             modified = true;
         }
         if (!Objects.equals(remark.get(), v.getRemark())) {
@@ -169,7 +169,6 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
             modified = true;
         }
 
-
         return modified;
     }
 
@@ -184,7 +183,7 @@ public class ContractItemViewModel extends IdentityViewModel<ContractItem> {
         return Math.abs(a - b) < 0.0001;
     }
 
-    public static ContractItemViewModel from(ContractItem contractItem) {
+    public static ContractItemViewModel from(ContractItemVo contractItem) {
         ContractItemViewModel viewModel = new ContractItemViewModel();
         viewModel.update(contractItem);
         return viewModel;

client/src/main/java/com/ecep/contract/vm/ContractKindViewModel.java

@@ -1,6 +1,6 @@
 package com.ecep.contract.vm;
 
-import com.ecep.contract.model.ContractKind;
+import com.ecep.contract.vo.ContractKindVo;
 
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
@@ -8,13 +8,13 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractKindViewModel extends IdentityViewModel<ContractKind> {
+public class ContractKindViewModel extends IdentityViewModel<ContractKindVo> {
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty title = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(ContractKind v) {
+    protected void updateFrom(ContractKindVo v) {
         super.updateFrom(v);
         code.set(v.getCode());
         name.set(v.getName());
@@ -22,7 +22,7 @@ public class ContractKindViewModel extends IdentityViewModel<ContractKind> {
     }
 
     @Override
-    public boolean copyTo(ContractKind v) {
+    public boolean copyTo(ContractKindVo v) {
         boolean result = super.copyTo(v);
         v.setCode(code.get());
         v.setName(name.get());

client/src/main/java/com/ecep/contract/vm/ContractTypeViewModel.java

@@ -1,6 +1,6 @@
 package com.ecep.contract.vm;
 
-import com.ecep.contract.model.ContractType;
+import com.ecep.contract.vo.ContractTypeVo;
 
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
@@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractTypeViewModel extends IdentityViewModel<ContractType> {
+public class ContractTypeViewModel extends IdentityViewModel<ContractTypeVo> {
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty title = new SimpleStringProperty();
@@ -17,7 +17,7 @@ public class ContractTypeViewModel extends IdentityViewModel<ContractType> {
     private SimpleStringProperty direction = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(ContractType v) {
+    protected void updateFrom(ContractTypeVo v) {
         super.updateFrom(v);
         code.set(v.getCode());
         name.set(v.getName());
@@ -26,9 +26,8 @@ public class ContractTypeViewModel extends IdentityViewModel<ContractType> {
         direction.set(v.getDirection());
     }
 
-
     @Override
-    public boolean copyTo(ContractType v) {
+    public boolean copyTo(ContractTypeVo v) {
         boolean result = super.copyTo(v);
         v.setCode(code.get());
         v.setName(name.get());

client/src/main/java/com/ecep/contract/vm/ContractViewModel.java

@@ -5,14 +5,7 @@ import java.time.LocalDateTime;
 import java.util.Objects;
 
 import com.ecep.contract.ContractPayWay;
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.CompanyContract;
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.ContractGroup;
-import com.ecep.contract.model.ContractKind;
-import com.ecep.contract.model.ContractType;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Project;
+import com.ecep.contract.vo.ContractVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -27,7 +20,7 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ContractViewModel extends IdentityViewModel<Contract> {
+public class ContractViewModel extends IdentityViewModel<ContractVo> {
     private SimpleStringProperty guid = new SimpleStringProperty();
     private SimpleObjectProperty<ContractPayWay> payWay = new SimpleObjectProperty<>();
 
@@ -37,15 +30,15 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
     /**
      * 分组
      */
-    private SimpleObjectProperty<ContractGroup> group = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> group = new SimpleObjectProperty<>();
     /**
      * 分类
      */
-    private SimpleObjectProperty<ContractType> type = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> type = new SimpleObjectProperty<>();
     /**
      * 性质
      */
-    private SimpleObjectProperty<ContractKind> kind = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> kind = new SimpleObjectProperty<>();
     /**
      * 主合同编号
      */
@@ -63,17 +56,17 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
      */
     private SimpleObjectProperty<LocalDate> endDate = new SimpleObjectProperty<>();
 
-    private SimpleObjectProperty<Employee> setupPerson = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> setupPerson = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> setupDate = new SimpleObjectProperty<>();
     /**
      * 生效人
      */
-    private SimpleObjectProperty<Employee> inurePerson = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> inurePerson = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> inureDate = new SimpleObjectProperty<>();
     /**
      * 修改人
      */
-    private SimpleObjectProperty<Employee> varyPerson = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> varyPerson = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> varyDate = new SimpleObjectProperty<>();
 
     /**
@@ -88,19 +81,19 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleObjectProperty<LocalDateTime> created = new SimpleObjectProperty<>();
 
-    private SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     /**
      * 业务员
      */
-    private SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
     /**
      * 经办人
      */
-    private SimpleObjectProperty<Employee> handler = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> handler = new SimpleObjectProperty<>();
     /**
      * 项目
      */
-    private SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
 
     /**
      * 版本
@@ -133,19 +126,13 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
      */
     private SimpleDoubleProperty execUnTaxAmount = new SimpleDoubleProperty();
 
-    public static ContractViewModel from(CompanyContract cc) {
-        ContractViewModel model = new ContractViewModel();
-        model.update(cc.getContract());
-        return model;
-    }
-
-    public static ContractViewModel from(Contract cc) {
+    public static ContractViewModel from(ContractVo cc) {
         ContractViewModel model = new ContractViewModel();
         model.update(cc);
         return model;
     }
 
-    public void updateFrom(Contract c) {
+    public void updateFrom(ContractVo c) {
         super.updateFrom(c);
         getGuid().set(c.getGuid());
         getPayWay().set(c.getPayWay());
@@ -153,28 +140,28 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
         getName().set(c.getName());
         getState().set(c.getState());
 
-        getGroup().set(c.getGroup());
-        getType().set(c.getType());
-        getKind().set(c.getKind());
+        getGroup().set(c.getGroupId());
+        getType().set(c.getTypeId());
+        getKind().set(c.getKindId());
 
         getParentCode().set(c.getParentCode());
 
-        getSetupPerson().set(c.getSetupPerson());
+        getSetupPerson().set(c.getSetupPersonId());
         getSetupDate().set(c.getSetupDate());
 
         getOrderDate().set(c.getOrderDate());
         getStartDate().set(c.getStartDate());
         getEndDate().set(c.getEndDate());
 
-        getInurePerson().set(c.getInurePerson());
+        getInurePerson().set(c.getInurePersonId());
         getInureDate().set(c.getInureDate());
 
-        getVaryPerson().set(c.getVaryPerson());
+        getVaryPerson().set(c.getVaryPersonId());
         getVaryDate().set(c.getVaryDate());
 
-        getCompany().set(c.getCompany());
-        getEmployee().set(c.getEmployee());
-        getHandler().set(c.getHandler());
+        getCompany().set(c.getCompanyId());
+        getEmployee().set(c.getEmployeeId());
+        getHandler().set(c.getHandlerId());
         getProject().set(c.getProject());
 
         path.set(c.getPath());
@@ -193,7 +180,7 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
         getExecUnTaxAmount().set(c.getExecUnTaxAmount());
     }
 
-    public boolean copyTo(Contract contract) {
+    public boolean copyTo(ContractVo contract) {
         boolean modified = super.copyTo(contract);
         if (!Objects.equals(guid.get(), contract.getGuid())) {
             contract.setGuid(guid.get());
@@ -216,16 +203,16 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
             modified = true;
         }
 
-        if (!Objects.equals(group.get(), contract.getGroup())) {
-            contract.setGroup(group.get());
+        if (!Objects.equals(group.get(), contract.getGroupId())) {
+            contract.setGroupId(group.get());
             modified = true;
         }
-        if (!Objects.equals(type.get(), contract.getType())) {
-            contract.setType(type.get());
+        if (!Objects.equals(type.get(), contract.getTypeId())) {
+            contract.setTypeId(type.get());
             modified = true;
         }
-        if (!Objects.equals(kind.get(), contract.getKind())) {
-            contract.setKind(kind.get());
+        if (!Objects.equals(kind.get(), contract.getKindId())) {
+            contract.setKindId(kind.get());
             modified = true;
         }
 
@@ -234,8 +221,8 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
             modified = true;
         }
 
-        if (!Objects.equals(setupPerson.get(), contract.getSetupPerson())) {
-            contract.setSetupPerson(setupPerson.get());
+        if (!Objects.equals(setupPerson.get(), contract.getSetupPersonId())) {
+            contract.setSetupPersonId(setupPerson.get());
             modified = true;
         }
 
@@ -259,8 +246,8 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
             modified = true;
         }
 
-        if (!Objects.equals(inurePerson.get(), contract.getInurePerson())) {
-            contract.setInurePerson(inurePerson.get());
+        if (!Objects.equals(inurePerson.get(), contract.getInurePersonId())) {
+            contract.setInurePersonId(inurePerson.get());
             modified = true;
         }
 
@@ -269,8 +256,8 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
             modified = true;
         }
 
-        if (!Objects.equals(varyPerson.get(), contract.getVaryPerson())) {
-            contract.setVaryPerson(varyPerson.get());
+        if (!Objects.equals(varyPerson.get(), contract.getVaryPersonId())) {
+            contract.setVaryPersonId(varyPerson.get());
             modified = true;
         }
 
@@ -288,16 +275,16 @@ public class ContractViewModel extends IdentityViewModel<Contract> {
             contract.setDescription(description.get());
             modified = true;
         }
-        if (!Objects.equals(getEmployee().get(), contract.getEmployee())) {
-            contract.setEmployee(getEmployee().get());
+        if (!Objects.equals(getEmployee().get(), contract.getEmployeeId())) {
+            contract.setEmployeeId(getEmployee().get());
             modified = true;
         }
-        if (!Objects.equals(getHandler().get(), contract.getHandler())) {
-            contract.setHandler(getHandler().get());
+        if (!Objects.equals(getHandler().get(), contract.getHandlerId())) {
+            contract.setHandlerId(getHandler().get());
             modified = true;
         }
-        if (!Objects.equals(getCompany().get(), contract.getCompany())) {
-            contract.setCompany(getCompany().get());
+        if (!Objects.equals(getCompany().get(), contract.getCompanyId())) {
+            contract.setCompanyId(getCompany().get());
             modified = true;
         }
         if (!Objects.equals(getProject().get(), contract.getProject())) {

client/src/main/java/com/ecep/contract/vm/CurrentEmployee.java

@@ -1,24 +1,12 @@
 package com.ecep.contract.vm;
 
-import java.time.format.DateTimeFormatter;
-import java.util.List;
-import java.util.Locale;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.util.StringUtils;
-
 import com.ecep.contract.Desktop;
 import com.ecep.contract.MyDateTimeUtils;
 import com.ecep.contract.SpringApp;
 import com.ecep.contract.controller.CurrentEmployeeInitialedEvent;
-import com.ecep.contract.model.Employee;
 import com.ecep.contract.model.EmployeeRole;
 import com.ecep.contract.service.EmployeeService;
-
+import com.ecep.contract.vo.EmployeeVo;
 import javafx.application.Platform;
 import javafx.beans.property.SimpleListProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -28,6 +16,16 @@ import javafx.util.converter.LocalDateStringConverter;
 import javafx.util.converter.LocalDateTimeStringConverter;
 import javafx.util.converter.NumberStringConverter;
 import lombok.ToString;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.util.StringUtils;
+
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 /**
  * 当前登录用户
@@ -81,7 +79,7 @@ public class CurrentEmployee extends EmployeeViewModel {
     }
 
     @Override
-    protected void updateFrom(Employee v) {
+    protected void updateFrom(EmployeeVo v) {
         super.updateFrom(v);
 
         // 根据用户的个人配置修改
@@ -142,8 +140,8 @@ public class CurrentEmployee extends EmployeeViewModel {
         executorService.submit(() -> {
             // issue #1 sss 2020-07-05
             EmployeeService employeeService = SpringApp.getBean(EmployeeService.class);
-            Employee employee = employeeService.findById(Desktop.instance.getActiveEmployeeId());
-            List<EmployeeRole> roles = employeeService.getRolesByEmployeeId(employee.getId());
+            EmployeeVo employee = employeeService.findById(getId().get());
+            List<EmployeeRole> roles = employeeService.getRolesByEmployeeId(getId().get());
             Platform.runLater(() -> {
                 update(employee);
                 rolesProperty().setAll(roles);

client/src/main/java/com/ecep/contract/vm/CustomerEntityViewModel.java

@@ -4,10 +4,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.CompanyCustomer;
-import com.ecep.contract.model.CompanyCustomerEntity;
-import com.ecep.contract.model.CustomerCatalog;
-import com.ecep.contract.model.Employee;
+import com.ecep.contract.vo.CompanyCustomerEntityVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -16,24 +13,30 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CustomerEntityViewModel extends IdentityViewModel<CompanyCustomerEntity> {
+public class CustomerEntityViewModel extends IdentityViewModel<CompanyCustomerEntityVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty abbName = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     /**
-     * 分组
+     * 分组, CustomerCatalog
      */
-    private SimpleObjectProperty<CustomerCatalog> catalog = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> catalog = new SimpleObjectProperty<>();
     /**
-     * 关联的企业
+     * 关联的企业, CompanyCustomer
      */
-    private SimpleObjectProperty<CompanyCustomer> customer = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> customer = new SimpleObjectProperty<>();
     /**
      * 发展日期
      */
     private SimpleObjectProperty<LocalDate> developDate = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Employee> creator = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Employee> modifier = new SimpleObjectProperty<>();
+    /**
+     * 创建人, Employee
+     */
+    private SimpleObjectProperty<Integer> creator = new SimpleObjectProperty<>();
+    /**
+     * 修改人, Employee
+     */
+    private SimpleObjectProperty<Integer> modifier = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> modifyDate = new SimpleObjectProperty<>();
     /**
      * 从U8系统同步时间
@@ -41,30 +44,30 @@ public class CustomerEntityViewModel extends IdentityViewModel<CompanyCustomerEn
     private SimpleObjectProperty<LocalDate> updatedDate = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDateTime> fetchedTime = new SimpleObjectProperty<>();
 
-    public static CustomerEntityViewModel from(CompanyCustomerEntity cc) {
+    public static CustomerEntityViewModel from(CompanyCustomerEntityVo cc) {
         CustomerEntityViewModel model = new CustomerEntityViewModel();
         model.update(cc);
         return model;
     }
 
     @Override
-    protected void updateFrom(CompanyCustomerEntity v) {
+    protected void updateFrom(CompanyCustomerEntityVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getAbbName().set(v.getAbbName());
         getCode().set(v.getCode());
-        getCatalog().set(v.getCatalog());
-        getCustomer().set(v.getCustomer());
+        getCatalog().set(v.getCustomerCatalogId());
+        getCustomer().set(v.getCustomerId());
         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());
         getFetchedTime().set(v.getFetchedTime());
     }
 
     @Override
-    public boolean copyTo(CompanyCustomerEntity v) {
+    public boolean copyTo(CompanyCustomerEntityVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(name.get(), v.getName())) {
             v.setName(name.get());
@@ -78,24 +81,24 @@ public class CustomerEntityViewModel extends IdentityViewModel<CompanyCustomerEn
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(catalog.get(), v.getCatalog())) {
-            v.setCatalog(catalog.get());
+        if (!Objects.equals(catalog.get(), v.getCustomerCatalogId())) {
+            v.setCustomerCatalogId(catalog.get());
             modified = true;
         }
-        if (!Objects.equals(customer.get(), v.getCustomer())) {
-            v.setCustomer(customer.get());
+        if (!Objects.equals(customer.get(), v.getCustomerId())) {
+            v.setCustomerId(customer.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())) {

client/src/main/java/com/ecep/contract/vm/CustomerSatisfactionSurveyViewModel.java

@@ -4,10 +4,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.CustomerSatisfactionSurvey;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Project;
-
+import com.ecep.contract.vo.CustomerSatisfactionSurveyVo;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -16,11 +13,11 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class CustomerSatisfactionSurveyViewModel extends IdentityViewModel<CustomerSatisfactionSurvey> implements ProjectBasedViewModel {
+public class CustomerSatisfactionSurveyViewModel extends IdentityViewModel<CustomerSatisfactionSurveyVo> implements ProjectBasedViewModel {
     /**
-     * 关联的项目
+     * 关联的项目,Project
      */
-    private SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
 
     private SimpleStringProperty code = new SimpleStringProperty();
 
@@ -28,7 +25,10 @@ public class CustomerSatisfactionSurveyViewModel extends IdentityViewModel<Custo
 
     private SimpleIntegerProperty totalScore = new SimpleIntegerProperty();
     private SimpleStringProperty data = new SimpleStringProperty();
-    private SimpleObjectProperty<Employee> applicant = new SimpleObjectProperty<>();
+    /**
+     * 创建人,Employee
+     */
+    private SimpleObjectProperty<Integer> applicant = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDateTime> applyTime = new SimpleObjectProperty<>();
     /**
      * 说明、注释
@@ -36,20 +36,20 @@ public class CustomerSatisfactionSurveyViewModel extends IdentityViewModel<Custo
     private SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(CustomerSatisfactionSurvey v) {
+    protected void updateFrom(CustomerSatisfactionSurveyVo v) {
         super.updateFrom(v);
         getProject().set(v.getProject());
         getCode().set(v.getCode());
         getDate().set(v.getDate());
         getTotalScore().set(v.getTotalScore());
         getData().set(v.getData());
-        getApplicant().set(v.getApplicant());
+        getApplicant().set(v.getApplicantId());
         getApplyTime().set(v.getApplyTime());
         getDescription().set(v.getDescription());
     }
 
     @Override
-    public boolean copyTo(CustomerSatisfactionSurvey v) {
+    public boolean copyTo(CustomerSatisfactionSurveyVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getProject().get(), v.getProject())) {
             v.setProject(getProject().get());
@@ -71,8 +71,8 @@ public class CustomerSatisfactionSurveyViewModel extends IdentityViewModel<Custo
             v.setData(getData().get());
             modified = true;
         }
-        if (!Objects.equals(getApplicant().get(), v.getApplicant())) {
-            v.setApplicant(getApplicant().get());
+        if (!Objects.equals(getApplicant().get(), v.getApplicantId())) {
+            v.setApplicantId(getApplicant().get());
             modified = true;
         }
         if (!Objects.equals(getApplyTime().get(), v.getApplyTime())) {

client/src/main/java/com/ecep/contract/vm/DeliverySignMethodViewModel.java

@@ -3,8 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.DeliverySignMethod;
-import com.ecep.contract.model.ProjectSaleType;
+import com.ecep.contract.vo.DeliverySignMethodVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -16,31 +15,32 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class DeliverySignMethodViewModel extends IdentityViewModel<DeliverySignMethod> {
+public class DeliverySignMethodViewModel extends IdentityViewModel<DeliverySignMethodVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
+    
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    private SimpleObjectProperty<ProjectSaleType> saleType = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> saleType = new SimpleObjectProperty<>();
 
-    public static DeliverySignMethodViewModel from(DeliverySignMethod v) {
+    public static DeliverySignMethodViewModel from(DeliverySignMethodVo v) {
         DeliverySignMethodViewModel model = new DeliverySignMethodViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(DeliverySignMethod v) {
+    protected void updateFrom(DeliverySignMethodVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
         getDescription().set(v.getDescription());
-        getSaleType().set(v.getSaleType());
+        getSaleType().set(v.getSaleTypeId());
     }
 
     @Override
-    public boolean copyTo(DeliverySignMethod v) {
+    public boolean copyTo(DeliverySignMethodVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());
@@ -54,8 +54,8 @@ public class DeliverySignMethodViewModel extends IdentityViewModel<DeliverySignM
             v.setDescription(getDescription().get());
             modified = true;
         }
-        if (!Objects.equals(getSaleType().get(), v.getSaleType())) {
-            v.setSaleType(getSaleType().get());
+        if (!Objects.equals(getSaleType().get(), v.getSaleTypeId())) {
+            v.setSaleTypeId(getSaleType().get());
             modified = true;
         }
 

client/src/main/java/com/ecep/contract/vm/DepartmentViewModel.java

@@ -2,8 +2,7 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Department;
-import com.ecep.contract.model.Employee;
+import com.ecep.contract.vo.DepartmentVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -13,30 +12,34 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class DepartmentViewModel extends IdentityViewModel<Department> {
+public class DepartmentViewModel extends IdentityViewModel<DepartmentVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
-    private SimpleObjectProperty<Employee> leader = new SimpleObjectProperty<>();
+    /**
+     * 部门负责人, Employee
+     */
+    private SimpleObjectProperty<Integer> leader = new SimpleObjectProperty<>();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleBooleanProperty isActive = new SimpleBooleanProperty();
 
-    public static DepartmentViewModel from(Department v) {
+    public static DepartmentViewModel from(DepartmentVo v) {
         DepartmentViewModel model = new DepartmentViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(Department v) {
+    protected void updateFrom(DepartmentVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
-        getLeader().set(v.getLeader());
+        getLeader().set(v.getLeaderId());
         getIsActive().set(v.isActive());
     }
 
     @Override
-    public boolean copyTo(Department v) {
-        if (v == null) return false;
+    public boolean copyTo(DepartmentVo v) {
+        if (v == null)
+            return false;
 
         boolean modified = super.copyTo(v);
         if (!Objects.equals(name.get(), v.getName())) {
@@ -47,8 +50,8 @@ public class DepartmentViewModel extends IdentityViewModel<Department> {
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(leader.get(), v.getLeader())) {
-            v.setLeader(leader.get());
+        if (!Objects.equals(leader.get(), v.getLeaderId())) {
+            v.setLeaderId(leader.get());
             modified = true;
         }
         if (!Objects.equals(isActive.get(), v.isActive())) {

client/src/main/java/com/ecep/contract/vm/EmployeeAuthBindViewModel.java

@@ -6,6 +6,7 @@ import java.util.Objects;
 import com.ecep.contract.model.Employee;
 import com.ecep.contract.model.EmployeeAuthBind;
 
+import com.ecep.contract.vo.EmployeeAuthBindVo;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
@@ -13,21 +14,25 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBind> implements EmployeeBasedViewModel {
+public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBindVo> implements EmployeeBasedViewModel {
     private SimpleStringProperty ip = new SimpleStringProperty();
     private SimpleStringProperty mac = new SimpleStringProperty();
-
-    private SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
+    /**
+     * Employee
+     */
+    private SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
 
     private SimpleObjectProperty<LocalDateTime> createTime = new SimpleObjectProperty<>();
-
-    private SimpleObjectProperty<Employee> updater = new SimpleObjectProperty<>();
+    /**
+     * Employee
+     */
+    private SimpleObjectProperty<Integer> updater = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDateTime> updateTime = new SimpleObjectProperty<>();
 
     private SimpleStringProperty description = new SimpleStringProperty();
 
 
-    public static EmployeeAuthBindViewModel from(EmployeeAuthBind v) {
+    public static EmployeeAuthBindViewModel from(EmployeeAuthBindVo v) {
         EmployeeAuthBindViewModel vm = new EmployeeAuthBindViewModel();
         vm.update(v);
         return vm;
@@ -35,19 +40,19 @@ public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBin
 
 
     @Override
-    protected void updateFrom(EmployeeAuthBind v) {
+    protected void updateFrom(EmployeeAuthBindVo v) {
         super.updateFrom(v);
         getIp().set(v.getIp());
         getMac().set(v.getMac());
-        getEmployee().set(v.getEmployee());
+        getEmployee().set(v.getEmployeeId());
         getCreateTime().set(v.getCreateTime());
-        getUpdater().set(v.getUpdater());
+        getUpdater().set(v.getUpdaterId());
         getUpdateTime().set(v.getUpdateTime());
         getDescription().set(v.getDescription());
     }
 
     @Override
-    public boolean copyTo(EmployeeAuthBind v) {
+    public boolean copyTo(EmployeeAuthBindVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getIp().get(), v.getIp())) {
             v.setIp(getIp().get());
@@ -57,16 +62,16 @@ public class EmployeeAuthBindViewModel extends IdentityViewModel<EmployeeAuthBin
             v.setMac(getMac().get());
             modified = true;
         }
-        if (!Objects.equals(getEmployee().get(), v.getEmployee())) {
-            v.setEmployee(getEmployee().get());
+        if (!Objects.equals(getEmployee().get(), v.getEmployeeId())) {
+            v.setEmployeeId(getEmployee().get());
             modified = true;
         }
         if (!Objects.equals(getCreateTime().get(), v.getCreateTime())) {
             v.setCreateTime(getCreateTime().get());
             modified = true;
         }
-        if (!Objects.equals(getUpdater().get(), v.getUpdater())) {
-            v.setUpdater(getUpdater().get());
+        if (!Objects.equals(getUpdater().get(), v.getUpdaterId())) {
+            v.setUpdaterId(getUpdater().get());
             modified = true;
         }
         if (!Objects.equals(getUpdateTime().get(), v.getUpdateTime())) {

client/src/main/java/com/ecep/contract/vm/EmployeeBasedViewModel.java

@@ -1,9 +1,12 @@
 package com.ecep.contract.vm;
 
-import com.ecep.contract.model.Employee;
-
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.ObjectProperty;
 
 public interface EmployeeBasedViewModel {
-    SimpleObjectProperty<Employee> getEmployee();
+    /**
+     * 员工ID, 可能为null，需要使用 ObjectProperty
+     * 
+     * @return
+     */
+    ObjectProperty<Integer> getEmployee();
 }

client/src/main/java/com/ecep/contract/vm/EmployeeLoginHistoryViewModel.java

@@ -3,8 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.EmployeeLoginHistory;
+import com.ecep.contract.vo.EmployeeLoginHistoryVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -13,35 +12,38 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class EmployeeLoginHistoryViewModel extends IdentityViewModel<EmployeeLoginHistory> implements EmployeeBasedViewModel {
+public class EmployeeLoginHistoryViewModel extends IdentityViewModel<EmployeeLoginHistoryVo> implements EmployeeBasedViewModel {
     private SimpleStringProperty ip = new SimpleStringProperty();
     private SimpleStringProperty mac = new SimpleStringProperty();
 
-    private SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
 
     private SimpleObjectProperty<LocalDateTime> loginTime = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDateTime> activeTime = new SimpleObjectProperty<>();
 
 
-    public static EmployeeLoginHistoryViewModel from(EmployeeLoginHistory v) {
+    /**
+     * 从Vo创建ViewModel
+     */
+    public static EmployeeLoginHistoryViewModel from(EmployeeLoginHistoryVo v) {
         EmployeeLoginHistoryViewModel vm = new EmployeeLoginHistoryViewModel();
-        vm.update(v);
+        vm.updateFrom(v);
         return vm;
     }
 
 
     @Override
-    protected void updateFrom(EmployeeLoginHistory v) {
+    protected void updateFrom(EmployeeLoginHistoryVo v) {
         super.updateFrom(v);
         getIp().set(v.getIp());
         getMac().set(v.getMac());
-        getEmployee().set(v.getEmployee());
+        getEmployee().set(v.getEmployeeId());
         getLoginTime().set(v.getLoginTime());
         getActiveTime().set(v.getActiveTime());
     }
 
     @Override
-    public boolean copyTo(EmployeeLoginHistory v) {
+    public boolean copyTo(EmployeeLoginHistoryVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getIp().get(), v.getIp())) {
             v.setIp(getIp().get());
@@ -51,8 +53,8 @@ public class EmployeeLoginHistoryViewModel extends IdentityViewModel<EmployeeLog
             v.setMac(getMac().get());
             modified = true;
         }
-        if (!Objects.equals(getEmployee().get(), v.getEmployee())) {
-            v.setEmployee(getEmployee().get());
+        if (!Objects.equals(getEmployee().get(), v.getEmployeeId())) {
+            v.setEmployeeId(getEmployee().get());
             modified = true;
         }
         if (!Objects.equals(getLoginTime().get(), v.getLoginTime())) {

client/src/main/java/com/ecep/contract/vm/EmployeeRoleViewModel.java

@@ -2,7 +2,7 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.EmployeeRole;
+import com.ecep.contract.vo.EmployeeRoleVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -11,21 +11,21 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class EmployeeRoleViewModel extends IdentityViewModel<EmployeeRole> {
+public class EmployeeRoleViewModel extends IdentityViewModel<EmployeeRoleVo> {
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleBooleanProperty systemAdministrator = new SimpleBooleanProperty();
     private SimpleBooleanProperty manager = new SimpleBooleanProperty();
     private SimpleBooleanProperty active = new SimpleBooleanProperty();
 
-    public static EmployeeRoleViewModel from(EmployeeRole v) {
+    public static EmployeeRoleViewModel from(EmployeeRoleVo v) {
         EmployeeRoleViewModel model = new EmployeeRoleViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(EmployeeRole v) {
+    protected void updateFrom(EmployeeRoleVo v) {
         super.updateFrom(v);
         getCode().set(v.getCode());
         getName().set(v.getName());
@@ -35,7 +35,7 @@ public class EmployeeRoleViewModel extends IdentityViewModel<EmployeeRole> {
     }
 
     @Override
-    public boolean copyTo(EmployeeRole v) {
+    public boolean copyTo(EmployeeRoleVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getCode().get(), v.getCode())) {
             v.setCode(getCode().get());

client/src/main/java/com/ecep/contract/vm/EmployeeViewModel.java

@@ -4,7 +4,7 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.model.Department;
-import com.ecep.contract.model.Employee;
+import com.ecep.contract.vo.EmployeeVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -14,10 +14,10 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class EmployeeViewModel extends IdentityViewModel<Employee> {
+public class EmployeeViewModel extends IdentityViewModel<EmployeeVo> {
     private SimpleStringProperty account = new SimpleStringProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
-    private SimpleObjectProperty<Department> department = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> department = new SimpleObjectProperty<>();
     private SimpleStringProperty alias = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty email = new SimpleStringProperty();
@@ -27,18 +27,18 @@ public class EmployeeViewModel extends IdentityViewModel<Employee> {
     private SimpleObjectProperty<LocalDate> leaveDate = new SimpleObjectProperty<>();
     private SimpleBooleanProperty isActive = new SimpleBooleanProperty();
 
-    public static EmployeeViewModel from(Employee v) {
+    public static EmployeeViewModel from(EmployeeVo v) {
         EmployeeViewModel model = new EmployeeViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(Employee v) {
+    protected void updateFrom(EmployeeVo v) {
         super.updateFrom(v);
         getAccount().set(v.getAccount());
         getName().set(v.getName());
-        getDepartment().set(v.getDepartment());
+        getDepartment().set(v.getDepartmentId());
         // getRoles().set(FXCollections.observableArrayList(v.getRoles()));
         getAlias().set(v.getAlias());
         getCode().set(v.getCode());
@@ -51,7 +51,7 @@ public class EmployeeViewModel extends IdentityViewModel<Employee> {
     }
 
     @Override
-    public boolean copyTo(Employee v) {
+    public boolean copyTo(EmployeeVo v) {
         if (v == null)
             return false;
 
@@ -64,8 +64,8 @@ public class EmployeeViewModel extends IdentityViewModel<Employee> {
             v.setName(name.get());
             modified = true;
         }
-        if (!Objects.equals(department.get(), v.getDepartment())) {
-            v.setDepartment(department.get());
+        if (!Objects.equals(department.get(), v.getDepartmentId())) {
+            v.setDepartmentId(department.get());
             modified = true;
         }
         // if (!Objects.equals(roles.get(), v.getRoles())) {

client/src/main/java/com/ecep/contract/vm/ExtendVendorInfoViewModel.java

@@ -2,9 +2,7 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.ExtendVendorInfo;
-import com.ecep.contract.model.VendorGroup;
+import com.ecep.contract.vo.ExtendVendorInfoVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -14,15 +12,15 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ExtendVendorInfoViewModel extends IdentityViewModel<ExtendVendorInfo> {
+public class ExtendVendorInfoViewModel extends IdentityViewModel<ExtendVendorInfoVo> {
     /**
-     * 关联的合同
+     * 关联的合同, Contract
      */
-    private SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> contract = new SimpleObjectProperty<>();
     /**
-     * 供应商分组
+     * 供应商分组, VendorGroup
      */
-    private SimpleObjectProperty<VendorGroup> group = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> group = new SimpleObjectProperty<>();
 
     /**
      * 合同序号
@@ -38,31 +36,31 @@ public class ExtendVendorInfoViewModel extends IdentityViewModel<ExtendVendorInf
      */
     private SimpleBooleanProperty prePurchase = new SimpleBooleanProperty();
 
-    public static ExtendVendorInfoViewModel from(ExtendVendorInfo v) {
+    public static ExtendVendorInfoViewModel from(ExtendVendorInfoVo v) {
         ExtendVendorInfoViewModel vm = new ExtendVendorInfoViewModel();
         vm.updateFrom(v);
         return vm;
     }
 
     @Override
-    protected void updateFrom(ExtendVendorInfo v) {
+    protected void updateFrom(ExtendVendorInfoVo v) {
         super.updateFrom(v);
-        getContract().set(v.getContract());
-        getGroup().set(v.getGroup());
+        getContract().set(v.getContractId());
+        getGroup().set(v.getGroupId());
         getCodeSequenceNumber().set(v.getCodeSequenceNumber());
         getAssignedProvider().set(v.isAssignedProvider());
         getPrePurchase().set(v.isPrePurchase());
     }
 
     @Override
-    public boolean copyTo(ExtendVendorInfo v) {
+    public boolean copyTo(ExtendVendorInfoVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
+        if (!Objects.equals(contract.get(), v.getContractId())) {
+            v.setContractId(contract.get());
             modified = true;
         }
-        if (!Objects.equals(group.get(), v.getGroup())) {
-            v.setGroup(group.get());
+        if (!Objects.equals(group.get(), v.getGroupId())) {
+            v.setGroupId(group.get());
             modified = true;
         }
         if (!Objects.equals(codeSequenceNumber.get(), v.getCodeSequenceNumber())) {

client/src/main/java/com/ecep/contract/vm/FunctionViewModel.java

@@ -2,7 +2,7 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Function;
+import com.ecep.contract.vo.FunctionVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -11,7 +11,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class FunctionViewModel extends IdentityViewModel<Function> {
+public class FunctionViewModel extends IdentityViewModel<FunctionVo> {  
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty key = new SimpleStringProperty();
     private SimpleStringProperty controller = new SimpleStringProperty();
@@ -19,7 +19,7 @@ public class FunctionViewModel extends IdentityViewModel<Function> {
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleBooleanProperty active = new SimpleBooleanProperty();
 
-    public static FunctionViewModel from(Function v) {
+    public static FunctionViewModel from(FunctionVo v) {
         FunctionViewModel model = new FunctionViewModel();
         model.update(v);
         return model;
@@ -27,7 +27,7 @@ public class FunctionViewModel extends IdentityViewModel<Function> {
 
 
     @Override
-    protected void updateFrom(Function v) {
+    protected void updateFrom(FunctionVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getKey().set(v.getKey());
@@ -38,7 +38,7 @@ public class FunctionViewModel extends IdentityViewModel<Function> {
     }
 
     @Override
-    public boolean copyTo(Function v) {
+    public boolean copyTo(FunctionVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(name.get(), v.getName())) {
             v.setName(name.get());

client/src/main/java/com/ecep/contract/vm/InventoryCatalogViewModel.java

@@ -2,7 +2,7 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.InventoryCatalog;
+import com.ecep.contract.vo.InventoryCatalogVo;
 
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
@@ -10,19 +10,19 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class InventoryCatalogViewModel extends IdentityViewModel<InventoryCatalog> {
+public class InventoryCatalogViewModel extends IdentityViewModel<InventoryCatalogVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(InventoryCatalog v) {
+    protected void updateFrom(InventoryCatalogVo v) {
         super.updateFrom(v);
         name.set(v.getName());
         code.set(v.getCode());
     }
 
     @Override
-    public boolean copyTo(InventoryCatalog v) {
+    public boolean copyTo(InventoryCatalogVo v) {
         boolean ret = super.copyTo(v);
         if (!Objects.equals(name.get(), v.getName())) {
             v.setName(name.get());

client/src/main/java/com/ecep/contract/vm/InventoryHistoryPriceViewModel.java

@@ -5,19 +5,19 @@ import java.time.Year;
 import java.util.Objects;
 
 import com.ecep.contract.model.HistoryPrice;
-import com.ecep.contract.model.Inventory;
-import com.ecep.contract.model.InventoryHistoryPrice;
+import com.ecep.contract.vo.InventoryHistoryPriceVo;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleFloatProperty;
+import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class InventoryHistoryPriceViewModel extends IdentityViewModel<InventoryHistoryPrice> {
-    private SimpleObjectProperty<Inventory> inventory = new SimpleObjectProperty<>();
+public class InventoryHistoryPriceViewModel extends IdentityViewModel<InventoryHistoryPriceVo> {
+    private SimpleIntegerProperty inventoryId = new SimpleIntegerProperty();
     private SimpleObjectProperty<Year> year = new SimpleObjectProperty<>();
     // latest  price
     private SimpleFloatProperty latestSaleTax = new SimpleFloatProperty();
@@ -69,9 +69,11 @@ public class InventoryHistoryPriceViewModel extends IdentityViewModel<InventoryH
     }
 
     @Override
-    protected void updateFrom(InventoryHistoryPrice v) {
+    protected void updateFrom(InventoryHistoryPriceVo v) {
         super.updateFrom(v);
-        inventory.set(v.getInventory());
+        if (v.getInventoryId() != null) {
+            inventoryId.set(v.getInventoryId());
+        }
         year.set(v.getYear());
         //  latest price
         updateHistoryPrice(v.getLatestPurchasePrice(), latestPurchaseTax, latestPurchasePrice, latestPurchaseTaxPrice, latestPurchasePriceDate);
@@ -112,14 +114,14 @@ public class InventoryHistoryPriceViewModel extends IdentityViewModel<InventoryH
     }
 
     @Override
-    public boolean copyTo(InventoryHistoryPrice v) {
+    public boolean copyTo(InventoryHistoryPriceVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(inventory.get(), v.getInventory())) {
-            v.setInventory(inventory.get());
+        if (!Objects.equals(inventoryId.get(), v.getInventoryId())) {
+            v.setInventoryId(inventoryId.get());
             modified = true;
         }
         if (!Objects.equals(year.get(), v.getYear())) {
-            v.setYear(year.get().getValue());
+            v.setYear(year.get());
             modified = true;
         }
 

client/src/main/java/com/ecep/contract/vm/InventoryViewModel.java

@@ -9,6 +9,7 @@ import com.ecep.contract.model.Inventory;
 import com.ecep.contract.model.InventoryCatalog;
 import com.ecep.contract.model.Price;
 import com.ecep.contract.model.VolumeSize;
+import com.ecep.contract.vo.InventoryVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -20,8 +21,11 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class InventoryViewModel extends IdentityViewModel<Inventory> {
-    private SimpleObjectProperty<InventoryCatalog> catalog = new SimpleObjectProperty<>();
+public class InventoryViewModel extends IdentityViewModel<InventoryVo> {
+    /**
+     * InventoryCatalog
+     */
+    private SimpleObjectProperty<Integer> catalog = new SimpleObjectProperty<>();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty specification = new SimpleStringProperty();
     private SimpleBooleanProperty specificationLock = new SimpleBooleanProperty();
@@ -51,23 +55,29 @@ public class InventoryViewModel extends IdentityViewModel<Inventory> {
     private SimpleDoubleProperty packagedVolume = new SimpleDoubleProperty();
 
     private SimpleStringProperty unit = new SimpleStringProperty();
-    private SimpleObjectProperty<Employee> creator = new SimpleObjectProperty<>();
+    /**
+     * Employee
+     */
+    private SimpleObjectProperty<Integer> creator = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> createTime = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Employee> updater = new SimpleObjectProperty<>();
+    /**
+     * Employee
+     */
+    private SimpleObjectProperty<Integer> updater = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDateTime> updateDate = new SimpleObjectProperty<>();
 
     private SimpleStringProperty description = new SimpleStringProperty();
 
-    public static InventoryViewModel from(Inventory v) {
+    public static InventoryViewModel from(InventoryVo v) {
         InventoryViewModel model = new InventoryViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(Inventory v) {
+    protected void updateFrom(InventoryVo v) {
         super.updateFrom(v);
-        getCatalog().set(v.getCatalog());
+        getCatalog().set(v.getCatalogId());
         getCode().set(v.getCode());
         getSpecification().set(v.getSpecification());
         getSpecificationLock().set(v.isSpecificationLock());
@@ -104,46 +114,46 @@ public class InventoryViewModel extends IdentityViewModel<Inventory> {
         getPackagedSizeHeight().set(packagedVolumeSize.getHeight());
         getPackagedVolume().set(packagedVolumeSize.getVolume());
 
-        getCreator().set(v.getCreator());
+        getCreator().set(v.getCreatorId());
         getCreateTime().set(v.getCreateTime());
-        getUpdater().set(v.getUpdater());
+        getUpdater().set(v.getUpdaterId());
         getUpdateDate().set(v.getUpdateDate());
         getDescription().set(v.getDescription());
 
     }
 
     @Override
-    public boolean copyTo(Inventory v) {
+    public boolean copyTo(InventoryVo v) {
         if (v == null)
             return false;
 
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(catalog.get(), v.getCatalog())) {
-            v.setCatalog(catalog.get());
+        if (!Objects.equals(getCatalog().get(), v.getCatalogId())) {
+            v.setCatalogId(getCatalog().get());
             modified = true;
         }
-        if (!Objects.equals(code.get(), v.getCode())) {
-            v.setCode(code.get());
+        if (!Objects.equals(getCode().get(), v.getCode())) {
+            v.setCode(getCode().get());
             modified = true;
         }
-        if (!Objects.equals(specification.get(), v.getSpecification())) {
-            v.setSpecification(specification.get());
+        if (!Objects.equals(getSpecification().get(), v.getSpecification())) {
+            v.setSpecification(getSpecification().get());
             modified = true;
         }
-        if (!Objects.equals(specificationLock.get(), v.isSpecificationLock())) {
-            v.setSpecificationLock(specificationLock.get());
+        if (!Objects.equals(getSpecificationLock().get(), v.isSpecificationLock())) {
+            v.setSpecificationLock(getSpecificationLock().get());
             modified = true;
         }
-        if (!Objects.equals(name.get(), v.getName())) {
-            v.setName(name.get());
+        if (!Objects.equals(getName().get(), v.getName())) {
+            v.setName(getName().get());
             modified = true;
         }
-        if (!Objects.equals(nameLock.get(), v.isNameLock())) {
-            v.setNameLock(nameLock.get());
+        if (!Objects.equals(getNameLock().get(), v.isNameLock())) {
+            v.setNameLock(getNameLock().get());
             modified = true;
         }
-        if (!Objects.equals(unit.get(), v.getUnit())) {
-            v.setUnit(unit.get());
+        if (!Objects.equals(getUnit().get(), v.getUnit())) {
+            v.setUnit(getUnit().get());
             modified = true;
         }
 
@@ -235,16 +245,16 @@ public class InventoryViewModel extends IdentityViewModel<Inventory> {
         }
 
         // creator or updater
-        if (!Objects.equals(creator.get(), v.getCreator())) {
-            v.setCreator(creator.get());
+        if (!Objects.equals(getCreator().get(), v.getCreatorId())) {
+            v.setCreatorId(getCreator().get());
             modified = true;
         }
-        if (!Objects.equals(createTime.get(), v.getCreateTime())) {
-            v.setCreateTime(createTime.get());
+        if (!Objects.equals(getCreateTime().get(), v.getCreateTime())) {
+            v.setCreateTime(getCreateTime().get());
             modified = true;
         }
-        if (!Objects.equals(updater.get(), v.getUpdater())) {
-            v.setUpdater(updater.get());
+        if (!Objects.equals(getUpdater().get(), v.getUpdaterId())) {
+            v.setUpdaterId(getUpdater().get());
             modified = true;
         }
         if (!Objects.equals(updateDate.get(), v.getUpdateDate())) {

client/src/main/java/com/ecep/contract/vm/InvoiceViewModel.java

@@ -4,7 +4,7 @@ import java.time.LocalDate;
 import java.util.Objects;
 
 import com.ecep.contract.model.Company;
-import com.ecep.contract.model.Invoice;
+import com.ecep.contract.vo.InvoiceVo;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -14,25 +14,25 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class InvoiceViewModel extends IdentityViewModel<Invoice> {
+public class InvoiceViewModel extends IdentityViewModel<InvoiceVo> {
     SimpleIntegerProperty id = new SimpleIntegerProperty();
     SimpleStringProperty code = new SimpleStringProperty();
-    SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> invoiceDate = new SimpleObjectProperty<>();
     SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(Invoice v) {
+    protected void updateFrom(InvoiceVo v) {
         super.updateFrom(v);
         getId().set(v.getId());
         getCode().set(v.getCode());
-        getCompany().set(v.getCompany());
+        getCompany().set(v.getCompanyId());
         getInvoiceDate().set(v.getInvoiceDate());
         getDescription().set(v.getDescription());
     }
 
     @Override
-    public boolean copyTo(Invoice v) {
+    public boolean copyTo(InvoiceVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(id.get(), v.getId())) {
             v.setId(id.get());
@@ -42,8 +42,8 @@ public class InvoiceViewModel extends IdentityViewModel<Invoice> {
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(company.get(), v.getCompanyId())) {
+            v.setCompanyId(company.get());
             modified = true;
         }
         if (!Objects.equals(invoiceDate.get(), v.getInvoiceDate())) {
@@ -57,7 +57,7 @@ public class InvoiceViewModel extends IdentityViewModel<Invoice> {
         return modified;
     }
 
-    public static InvoiceViewModel from(Invoice invoice) {
+    public static InvoiceViewModel from(InvoiceVo invoice) {
         InvoiceViewModel vm = new InvoiceViewModel();
         vm.updateFrom(invoice);
         return vm;

client/src/main/java/com/ecep/contract/vm/ProductTypeViewModel.java

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.ProductType;
+import com.ecep.contract.vo.ProductTypeVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -12,20 +12,20 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProductTypeViewModel extends IdentityViewModel<ProductType> {
+public class ProductTypeViewModel extends IdentityViewModel<ProductTypeVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    public static ProductTypeViewModel from(ProductType v) {
+    public static ProductTypeViewModel from(ProductTypeVo v) {
         ProductTypeViewModel model = new ProductTypeViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProductType v) {
+    protected void updateFrom(ProductTypeVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
@@ -33,7 +33,7 @@ public class ProductTypeViewModel extends IdentityViewModel<ProductType> {
     }
 
     @Override
-    public boolean copyTo(ProductType v) {
+    public boolean copyTo(ProductTypeVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());

client/src/main/java/com/ecep/contract/vm/ProductUsageViewModel.java

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.ProductUsage;
+import com.ecep.contract.vo.ProductUsageVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -12,20 +12,20 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProductUsageViewModel extends IdentityViewModel<ProductUsage> {
+public class ProductUsageViewModel extends IdentityViewModel<ProductUsageVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    public static ProductUsageViewModel from(ProductUsage v) {
+    public static ProductUsageViewModel from(ProductUsageVo v) {
         ProductUsageViewModel model = new ProductUsageViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProductUsage v) {
+    protected void updateFrom(ProductUsageVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
@@ -33,7 +33,7 @@ public class ProductUsageViewModel extends IdentityViewModel<ProductUsage> {
     }
 
     @Override
-    public boolean copyTo(ProductUsage v) {
+    public boolean copyTo(ProductUsageVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());

client/src/main/java/com/ecep/contract/vm/ProjectBasedViewModel.java

@@ -1,9 +1,10 @@
 package com.ecep.contract.vm;
 
-import com.ecep.contract.model.Project;
-
-import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.ObjectProperty;
 
 public interface ProjectBasedViewModel {
-    SimpleObjectProperty<Project> getProject();
+    /** 
+     * Project
+    */
+    ObjectProperty<Integer> getProject();
 }

client/src/main/java/com/ecep/contract/vm/ProjectBidViewModel.java

@@ -1,38 +1,28 @@
 package com.ecep.contract.vm;
 
+import com.ecep.contract.util.NumberUtils;
+import com.ecep.contract.vo.ProjectBidVo;
+import javafx.beans.property.*;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.util.StringUtils;
+
 import java.io.File;
 import java.time.LocalDateTime;
 import java.util.Objects;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 
-import org.springframework.util.StringUtils;
-
-import com.ecep.contract.model.CompanyCustomerEvaluationFormFile;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Project;
-import com.ecep.contract.model.ProjectBid;
-import com.ecep.contract.model.ProjectCost;
-import com.ecep.contract.util.NumberUtils;
-
-import javafx.beans.property.SimpleBooleanProperty;
-import javafx.beans.property.SimpleDoubleProperty;
-import javafx.beans.property.SimpleIntegerProperty;
-import javafx.beans.property.SimpleObjectProperty;
-import javafx.beans.property.SimpleStringProperty;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
 /**
  * 项目报价
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implements ProjectBasedViewModel {
+public class ProjectBidViewModel extends IdentityViewModel<ProjectBidVo> implements ProjectBasedViewModel {
     /**
-     * 关联的项目
+     * 关联的项目， Project
      */
-    private SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
     /**
      * 客户咨询等级（级别）
      */
@@ -43,13 +33,13 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
      */
     private SimpleDoubleProperty amount = new SimpleDoubleProperty();
     /**
-     * 客户咨询评估文件，根据资信资评估文件生成客户资信等级（级别）
+     * 客户咨询评估文件，根据资信资评估文件生成客户资信等级（级别）, CompanyCustomerEvaluationFormFile
      */
-    private SimpleObjectProperty<CompanyCustomerEvaluationFormFile> evaluationFile = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> evaluationFile = new SimpleObjectProperty<>();
     /**
-     * 项目成本表
+     * 项目成本表, ProjectCost
      */
-    private SimpleObjectProperty<ProjectCost> cost = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> cost = new SimpleObjectProperty<>();
 
     /**
      * 是否标准付款方式
@@ -72,17 +62,17 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
      */
     private SimpleObjectProperty<LocalDateTime> applyTime = new SimpleObjectProperty<>();
     /**
-     * 申请人
+     * 申请人, Employee
      */
-    private SimpleObjectProperty<Employee> applicant = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> applicant = new SimpleObjectProperty<>();
     /**
      * 审核时间
      */
     private SimpleObjectProperty<LocalDateTime> authorizationTime = new SimpleObjectProperty<>();
     /**
-     * 审核人
+     * 审核人, Employee
      */
-    private SimpleObjectProperty<Employee> authorizer = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> authorizer = new SimpleObjectProperty<>();
     /**
      * 审核文件
      */
@@ -97,27 +87,27 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
      */
     private SimpleStringProperty description = new SimpleStringProperty();
 
-    public static ProjectBidViewModel from(ProjectBid v) {
+    public static ProjectBidViewModel from(ProjectBidVo v) {
         ProjectBidViewModel model = new ProjectBidViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProjectBid v) {
+    protected void updateFrom(ProjectBidVo v) {
         super.updateFrom(v);
         getProject().set(v.getProject());
         getLevel().set(v.getLevel());
         getAmount().set(v.getAmount());
-        getEvaluationFile().set(v.getEvaluationFile());
-        getCost().set(v.getCost());
+        getEvaluationFile().set(v.getEvaluationFileId());
+        getCost().set(v.getCostId());
         getStandardPayWay().set(v.isStandardPayWay());
         getNoStandardPayWayText().set(v.getNoStandardPayWayText());
         getStandardContractText().set(v.isStandardContractText());
         getNoStandardContractText().set(v.getNoStandardContractText());
-        getApplicant().set(v.getApplicant());
+        getApplicant().set(v.getApplicantId());
         getApplyTime().set(v.getApplyTime());
-        getAuthorizer().set(v.getAuthorizer());
+        getAuthorizer().set(v.getAuthorizerId());
         getAuthorizationTime().set(v.getAuthorizationTime());
 
         if (StringUtils.hasText(v.getAuthorizationFile())) {
@@ -138,7 +128,7 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
     }
 
     @Override
-    public boolean copyTo(ProjectBid v) {
+    public boolean copyTo(ProjectBidVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getProject().get(), v.getProject())) {
             v.setProject(getProject().get());
@@ -152,12 +142,12 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
             v.setAmount(getAmount().get());
             modified = true;
         }
-        if (!Objects.equals(getEvaluationFile().get(), v.getEvaluationFile())) {
-            v.setEvaluationFile(getEvaluationFile().get());
+        if (!Objects.equals(getEvaluationFile().get(), v.getEvaluationFileId())) {
+            v.setEvaluationFileId(getEvaluationFile().get());
             modified = true;
         }
-        if (!Objects.equals(getCost().get(), v.getCost())) {
-            v.setCost(getCost().get());
+        if (!Objects.equals(getCost().get(), v.getCostId())) {
+            v.setCostId(getCost().get());
             modified = true;
         }
 
@@ -178,16 +168,16 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
             modified = true;
         }
 
-        if (!Objects.equals(getApplicant().get(), v.getApplicant())) {
-            v.setApplicant(getApplicant().get());
+        if (!Objects.equals(getApplicant().get(), v.getApplicantId())) {
+            v.setApplicantId(getApplicant().get());
             modified = true;
         }
         if (!Objects.equals(getApplyTime().get(), v.getApplyTime())) {
             v.setApplyTime(getApplyTime().get());
             modified = true;
         }
-        if (!Objects.equals(getAuthorizer().get(), v.getAuthorizer())) {
-            v.setAuthorizer(getAuthorizer().get());
+        if (!Objects.equals(getAuthorizer().get(), v.getAuthorizerId())) {
+            v.setAuthorizerId(getAuthorizer().get());
             modified = true;
         }
         if (!Objects.equals(getAuthorizationTime().get(), v.getAuthorizationTime())) {
@@ -195,11 +185,11 @@ public class ProjectBidViewModel extends IdentityViewModel<ProjectBid> implement
             modified = true;
         }
 
-        if (updateFile(authorizationFile, v::getAuthorizationFile, v::setAuthorizationFile)) {
+        if (updateFile(getAuthorizationFile(), v::getAuthorizationFile, v::setAuthorizationFile)) {
             modified = true;
         }
 
-        if (updateFile(bidAcceptanceLetterFile, v::getBidAcceptanceLetterFile, v::setBidAcceptanceLetterFile)) {
+        if (updateFile(getBidAcceptanceLetterFile(), v::getBidAcceptanceLetterFile, v::setBidAcceptanceLetterFile)) {
             modified = true;
         }
 

client/src/main/java/com/ecep/contract/vm/ProjectCostItemViewModel.java

@@ -3,11 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Inventory;
-import com.ecep.contract.model.ProjectCost;
-import com.ecep.contract.model.ProjectCostItem;
-
+import com.ecep.contract.vo.ProjectCostItemVo;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -20,20 +16,20 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem> {
+public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItemVo> {
     /**
-     * 关联的合同成本对象
+     * 关联的合同成本对象ID
      */
-    SimpleObjectProperty<ProjectCost> cost = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> costId = new SimpleObjectProperty<>();
 
     SimpleStringProperty title = new SimpleStringProperty();
     SimpleStringProperty specification = new SimpleStringProperty();
     SimpleStringProperty unit = new SimpleStringProperty();
 
     /**
-     * 存货
+     * 存货ID
      */
-    SimpleObjectProperty<Inventory> inventory = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> inventoryId = new SimpleObjectProperty<>();
 
     SimpleDoubleProperty inQuantity = new SimpleDoubleProperty();
     SimpleDoubleProperty inTaxRate = new SimpleDoubleProperty();
@@ -59,21 +55,27 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
 
     SimpleObjectProperty<LocalDateTime> createDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> updateDate = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> creator = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> updater = new SimpleObjectProperty<>();
+    /**
+     * 创建者ID
+     */
+    SimpleObjectProperty<Integer> creatorId = new SimpleObjectProperty<>();
+    /**
+     * 更新者ID
+     */
+    SimpleObjectProperty<Integer> updaterId = new SimpleObjectProperty<>();
 
     SimpleBooleanProperty updatePriceWay = new SimpleBooleanProperty(false);
 
     SimpleStringProperty remark = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(ProjectCostItem v) {
+    protected void updateFrom(ProjectCostItemVo v) {
         super.updateFrom(v);
-        getCost().set(v.getCost());
+        getCostId().set(v.getCostId());
         getTitle().set(v.getTitle());
         getSpecification().set(v.getSpecification());
         getUnit().set(v.getUnit());
-        getInventory().set(v.getInventory());
+        getInventoryId().set(v.getInventoryId());
 
         getInQuantity().set(v.getInQuantity());
         getInTaxRate().set(v.getInTaxRate());
@@ -89,8 +91,8 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
 
         getCreateDate().set(v.getCreateDate());
         getUpdateDate().set(v.getUpdateDate());
-        getCreator().set(v.getCreator());
-        getUpdater().set(v.getUpdater());
+        getCreatorId().set(v.getCreatorId());
+        getUpdaterId().set(v.getUpdaterId());
         getRemark().set(v.getRemark());
     }
 
@@ -123,10 +125,10 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
     }
 
     @Override
-    public boolean copyTo(ProjectCostItem v) {
+    public boolean copyTo(ProjectCostItemVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(cost.get(), v.getCost())) {
-            v.setCost(cost.get());
+        if (!Objects.equals(costId.get(), v.getCostId())) {
+            v.setCostId(costId.get());
             modified = true;
         }
         if (!Objects.equals(title.get(), v.getTitle())) {
@@ -141,8 +143,8 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
             v.setUnit(unit.get());
             modified = true;
         }
-        if (!Objects.equals(inventory.get(), v.getInventory())) {
-            v.setInventory(inventory.get());
+        if (!Objects.equals(inventoryId.get(), v.getInventoryId())) {
+            v.setInventoryId(inventoryId.get());
             modified = true;
         }
 
@@ -180,12 +182,12 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
             v.setUpdateDate(updateDate.get());
             modified = true;
         }
-        if (!Objects.equals(creator.get(), v.getCreator())) {
-            v.setCreator(creator.get());
+        if (!Objects.equals(creatorId.get(), v.getCreatorId())) {
+            v.setCreatorId(creatorId.get());
             modified = true;
         }
-        if (!Objects.equals(updater.get(), v.getUpdater())) {
-            v.setUpdater(updater.get());
+        if (!Objects.equals(updaterId.get(), v.getUpdaterId())) {
+            v.setUpdaterId(updaterId.get());
             modified = true;
         }
         if (!Objects.equals(remark.get(), v.getRemark())) {
@@ -206,7 +208,7 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
         return Math.abs(a - b) < 0.0001;
     }
 
-    public static ProjectCostItemViewModel from(ProjectCostItem v) {
+    public static ProjectCostItemViewModel from(ProjectCostItemVo v) {
         ProjectCostItemViewModel viewModel = new ProjectCostItemViewModel();
         viewModel.update(v);
         return viewModel;
@@ -234,13 +236,13 @@ public class ProjectCostItemViewModel extends IdentityViewModel<ProjectCostItem>
     }
 
     void taxPrice2ExclusiveTaxPrice(SimpleDoubleProperty taxPrice, SimpleDoubleProperty exclusiveTaxPrice,
-            SimpleDoubleProperty taxRate) {
+                                    SimpleDoubleProperty taxRate) {
         double value = taxPrice.get();
         exclusiveTaxPrice.setValue(value / ((100 + taxRate.get()) / 100));
     }
 
     void exclusiveTaxPrice2TaxPrice(SimpleDoubleProperty exclusiveTaxPrice, SimpleDoubleProperty taxPrice,
-            SimpleDoubleProperty taxRate) {
+                                    SimpleDoubleProperty taxRate) {
         double value = exclusiveTaxPrice.get();
         taxPrice.setValue(value * ((100 + taxRate.get()) / 100.0));
     }

client/src/main/java/com/ecep/contract/vm/ProjectCostViewModel.java

@@ -6,11 +6,8 @@ import java.util.Objects;
 
 import org.springframework.util.StringUtils;
 
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Project;
-import com.ecep.contract.model.ProjectCost;
 import com.ecep.contract.util.NumberUtils;
+import com.ecep.contract.vo.ProjectCostVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -23,23 +20,23 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> implements ProjectBasedViewModel {
+public class ProjectCostViewModel extends IdentityViewModel<ProjectCostVo> implements ProjectBasedViewModel {
     /**
-     * 合同对象
+     * 合同对象,Contract
      */
-    SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> contract = new SimpleObjectProperty<>();
     /**
-     * 项目对象
+     * 项目对象,Project
      */
-    SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
     /**
      * 申请日期
      */
     private SimpleObjectProperty<LocalDateTime> applyTime = new SimpleObjectProperty<>();
     /**
-     * 申请人
+     * 申请人,Employee
      */
-    private SimpleObjectProperty<Employee> applicant = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> applicant = new SimpleObjectProperty<>();
     /**
      * 审核时间
      */
@@ -49,9 +46,9 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
      */
     private SimpleObjectProperty<File> authorizationFile = new SimpleObjectProperty<>();
     /**
-     * 审核人
+     * 审核人, Employee
      */
-    private SimpleObjectProperty<Employee> authorizer = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> authorizer = new SimpleObjectProperty<>();
     /**
      * 是否是标准合同文本
      */
@@ -145,13 +142,13 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
     private SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(ProjectCost v) {
+    protected void updateFrom(ProjectCostVo v) {
         super.updateFrom(v);
-        getContract().set(v.getContract());
+        getContract().set(v.getContractId());
         getProject().set(v.getProject());
-        getApplicant().set(v.getApplicant());
+        getApplicant().set(v.getApplicantId());
         getApplyTime().set(v.getApplyTime());
-        getAuthorizer().set(v.getAuthorizer());
+        getAuthorizer().set(v.getAuthorizerId());
         getAuthorizationTime().set(v.getAuthorizationTime());
 
         if (StringUtils.hasText(v.getAuthorizationFile())) {
@@ -186,10 +183,10 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
     }
 
     @Override
-    public boolean copyTo(ProjectCost v) {
+    public boolean copyTo(ProjectCostVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
+        if (!Objects.equals(contract.get(), v.getContractId())) {
+            v.setContractId(contract.get());
             modified = true;
         }
         if (!Objects.equals(project.get(), v.getProject())) {
@@ -197,16 +194,16 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
             modified = true;
         }
 
-        if (!Objects.equals(applicant.get(), v.getApplicant())) {
-            v.setApplicant(applicant.get());
+        if (!Objects.equals(applicant.get(), v.getApplicantId())) {
+            v.setApplicantId(applicant.get());
             modified = true;
         }
         if (!Objects.equals(applyTime.get(), v.getApplyTime())) {
             v.setApplyTime(applyTime.get());
             modified = true;
         }
-        if (!Objects.equals(authorizer.get(), v.getAuthorizer())) {
-            v.setAuthorizer(authorizer.get());
+        if (!Objects.equals(authorizer.get(), v.getAuthorizerId())) {
+            v.setAuthorizerId(authorizer.get());
             modified = true;
         }
         if (!Objects.equals(authorizationTime.get(), v.getAuthorizationTime())) {
@@ -221,7 +218,8 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
                 file = new File(v.getAuthorizationFile());
             }
             if (!Objects.equals(authorizationFile.get(), file)) {
-                v.setAuthorizationFile(authorizationFile.get() == null ? null : authorizationFile.get().getAbsolutePath());
+                v.setAuthorizationFile(
+                        authorizationFile.get() == null ? null : authorizationFile.get().getAbsolutePath());
                 modified = true;
             }
         }
@@ -318,7 +316,7 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
         return modified;
     }
 
-    public static ProjectCostViewModel from(ProjectCost projectCost) {
+    public static ProjectCostViewModel from(ProjectCostVo projectCost) {
         ProjectCostViewModel viewModel = new ProjectCostViewModel();
         viewModel.update(projectCost);
         return viewModel;
@@ -330,7 +328,8 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
             getGrossProfitMargin().set(0);
             return;
         }
-        double grossProfit = amount - getOutExclusiveTaxAmount().get() - getStampTaxFee().get() - getTaxAndSurchargesFee().get();
+        double grossProfit = amount - getOutExclusiveTaxAmount().get() - getStampTaxFee().get()
+                - getTaxAndSurchargesFee().get();
         getGrossProfitMargin().set(grossProfit * 100 / amount);
     }
 
@@ -343,7 +342,8 @@ public class ProjectCostViewModel extends IdentityViewModel<ProjectCost> impleme
     }
 
     public void updateTaxAndSurchargesFee() {
-        double value = (getInTaxAmount().get() - getInExclusiveTaxAmount().get()) - (getOutTaxAmount().get() - getOutExclusiveTaxAmount().get());
+        double value = (getInTaxAmount().get() - getInExclusiveTaxAmount().get())
+                - (getOutTaxAmount().get() - getOutExclusiveTaxAmount().get());
         getTaxAndSurchargesFee().set((float) (value * getTaxAndSurcharges().get() / 100));
         updateGrossProfitMargin();
     }

client/src/main/java/com/ecep/contract/vm/ProjectFileViewModel.java

@@ -1,7 +1,7 @@
 package com.ecep.contract.vm;
 
-import com.ecep.contract.model.Project;
-import com.ecep.contract.model.ProjectFile;
+import com.ecep.contract.vo.ProjectVo;
+import com.ecep.contract.vo.ProjectFileVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import lombok.Data;
@@ -9,13 +9,13 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectFileViewModel extends IdentityViewModel<ProjectFile> implements ProjectBasedViewModel {
+public class ProjectFileViewModel extends IdentityViewModel<ProjectFileVo> implements ProjectBasedViewModel {
     /**
      * 关联的项目
      */
-    private SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
 
-    public static ProjectFileViewModel from(ProjectFile file) {
+    public static ProjectFileViewModel from(ProjectFileVo file) {
         ProjectFileViewModel viewModel = new ProjectFileViewModel();
         viewModel.update(file);
         return viewModel;

client/src/main/java/com/ecep/contract/vm/ProjectFundPlanViewModel.java

@@ -5,10 +5,8 @@ import java.time.LocalDateTime;
 import java.util.Objects;
 
 import com.ecep.contract.ContractPayWay;
-import com.ecep.contract.model.ContractPayPlan;
-import com.ecep.contract.model.Project;
-import com.ecep.contract.model.ProjectFundPlan;
 import com.ecep.contract.util.NumberUtils;
+import com.ecep.contract.vo.ProjectFundPlanVo;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleFloatProperty;
@@ -22,11 +20,11 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlan> implements ProjectBasedViewModel {
+public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlanVo> implements ProjectBasedViewModel {
     /**
      * 关联的项目
      */
-    private SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
 
     /**
      * 付款日期
@@ -54,7 +52,7 @@ public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlan>
     /**
      * 合同付款计划
      */
-    private SimpleObjectProperty<ContractPayPlan> contractPayPlan = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> contractPayPlan = new SimpleObjectProperty<>();
 
     /**
      * 更新日期
@@ -67,20 +65,20 @@ public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlan>
     private SimpleObjectProperty<ContractPayWay> payWay = new SimpleObjectProperty<>();
 
     /**
-     * 从实体对象创建视图模型
+     * 从对象创建视图模型
      */
-    public static ProjectFundPlanViewModel from(ProjectFundPlan entity) {
+    public static ProjectFundPlanViewModel from(ProjectFundPlanVo entity) {
         ProjectFundPlanViewModel model = new ProjectFundPlanViewModel();
         model.update(entity);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProjectFundPlan entity) {
+    protected void updateFrom(ProjectFundPlanVo entity) {
         super.updateFrom(entity);
 
         // 设置项目关联
-        getProject().set(entity.getProject());
+        getProject().set(entity.getProjectId());
 
         // 设置付款相关信息
         getPayDate().set(entity.getPayDate());
@@ -89,7 +87,7 @@ public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlan>
         getPayTerm().set(entity.getPayTerm());
 
         // 设置合同付款计划关联
-        getContractPayPlan().set(entity.getContractPayPlan());
+        getContractPayPlan().set(entity.getContractPayPlanId());
 
         // 设置更新日期
         getUpdateDate().set(entity.getUpdateDate());
@@ -99,12 +97,12 @@ public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlan>
     }
 
     @Override
-    public boolean copyTo(ProjectFundPlan entity) {
+    public boolean copyTo(ProjectFundPlanVo entity) {
         boolean modified = super.copyTo(entity);
 
         // 复制项目关联
-        if (!Objects.equals(getProject().get(), entity.getProject())) {
-            entity.setProject(getProject().get());
+        if (!Objects.equals(getProject().get(), entity.getProjectId())) {
+            entity.setProjectId(getProject().get());
             modified = true;
         }
 
@@ -130,8 +128,8 @@ public class ProjectFundPlanViewModel extends IdentityViewModel<ProjectFundPlan>
         }
 
         // 复制合同付款计划关联
-        if (!Objects.equals(getContractPayPlan().get(), entity.getContractPayPlan())) {
-            entity.setContractPayPlan(getContractPayPlan().get());
+        if (!Objects.equals(getContractPayPlan().get(), entity.getContractPayPlanId())) {
+            entity.setContractPayPlanId(getContractPayPlan().get());
             modified = true;
         }
 

client/src/main/java/com/ecep/contract/vm/ProjectIndustryViewModel.java

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.ProjectIndustry;
+import com.ecep.contract.vo.ProjectIndustryVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -12,20 +12,20 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectIndustryViewModel extends IdentityViewModel<ProjectIndustry> {
+public class ProjectIndustryViewModel extends IdentityViewModel<ProjectIndustryVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    public static ProjectIndustryViewModel from(ProjectIndustry v) {
+    public static ProjectIndustryViewModel from(ProjectIndustryVo v) {
         ProjectIndustryViewModel model = new ProjectIndustryViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProjectIndustry v) {
+    protected void updateFrom(ProjectIndustryVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
@@ -33,7 +33,7 @@ public class ProjectIndustryViewModel extends IdentityViewModel<ProjectIndustry>
     }
 
     @Override
-    public boolean copyTo(ProjectIndustry v) {
+    public boolean copyTo(ProjectIndustryVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());

client/src/main/java/com/ecep/contract/vm/ProjectQuotationViewModel.java

@@ -6,10 +6,7 @@ import java.util.Objects;
 
 import org.springframework.util.StringUtils;
 
-import com.ecep.contract.model.CompanyCustomerEvaluationFormFile;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Project;
-import com.ecep.contract.model.ProjectQuotation;
+import com.ecep.contract.vo.ProjectQuotationVo;
 import com.ecep.contract.util.NumberUtils;
 
 import javafx.beans.property.SimpleBooleanProperty;
@@ -25,11 +22,11 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotation> {
+public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotationVo> {
     /**
-     * 关联的项目
+     * 关联的项目ID
      */
-    private SimpleObjectProperty<Project> project = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> project = new SimpleObjectProperty<>();
     /**
      * 客户咨询等级（级别）
      */
@@ -48,25 +45,25 @@ public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotatio
      */
     private SimpleDoubleProperty amount = new SimpleDoubleProperty();
     /**
-     * 客户咨询评估文件，根据资信资评估文件生成客户资信等级（级别）
+     * 客户咨询评估文件ID，根据资信资评估文件生成客户资信等级（级别）
      */
-    private SimpleObjectProperty<CompanyCustomerEvaluationFormFile> evaluationFile = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> evaluationFile = new SimpleObjectProperty<>();
     /**
      * 申请日期
      */
     private SimpleObjectProperty<LocalDateTime> applyTime = new SimpleObjectProperty<>();
     /**
-     * 申请人
+     * 申请人ID
      */
-    private SimpleObjectProperty<Employee> applicant = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> applicant = new SimpleObjectProperty<>();
     /**
      * 审核时间
      */
     private SimpleObjectProperty<LocalDateTime> authorizationTime = new SimpleObjectProperty<>();
     /**
-     * 审核人
+     * 审核人ID
      */
-    private SimpleObjectProperty<Employee> authorizer = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> authorizer = new SimpleObjectProperty<>();
     /**
      * 审核文件
      */
@@ -77,24 +74,24 @@ public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotatio
     private SimpleStringProperty description = new SimpleStringProperty();
 
 
-    public static ProjectQuotationViewModel from(ProjectQuotation v) {
+    public static ProjectQuotationViewModel from(ProjectQuotationVo v) {
         ProjectQuotationViewModel model = new ProjectQuotationViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProjectQuotation v) {
+    protected void updateFrom(ProjectQuotationVo v) {
         super.updateFrom(v);
         getLevel().set(v.getLevel());
         getStandardPayWay().set(v.isStandardPayWay());
         getNoStandardPayWayText().set(v.getNoStandardPayWayText());
         getAmount().set(v.getAmount());
-        getEvaluationFile().set(v.getEvaluationFile());
+        getEvaluationFile().set(v.getEvaluationFileId());
         getProject().set(v.getProject());
-        getApplicant().set(v.getApplicant());
+        getApplicant().set(v.getApplicantId());
         getApplyTime().set(v.getApplyTime());
-        getAuthorizer().set(v.getAuthorizer());
+        getAuthorizer().set(v.getAuthorizerId());
         getAuthorizationTime().set(v.getAuthorizationTime());
 
         if (StringUtils.hasText(v.getAuthorizationFile())) {
@@ -108,7 +105,7 @@ public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotatio
     }
 
     @Override
-    public boolean copyTo(ProjectQuotation v) {
+    public boolean copyTo(ProjectQuotationVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getLevel().get(), v.getLevel())) {
             v.setLevel(getLevel().get());
@@ -126,24 +123,24 @@ public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotatio
             v.setAmount(getAmount().get());
             modified = true;
         }
-        if (!Objects.equals(getEvaluationFile().get(), v.getEvaluationFile())) {
-            v.setEvaluationFile(getEvaluationFile().get());
+        if (!Objects.equals(getEvaluationFile().get(), v.getEvaluationFileId())) {
+            v.setEvaluationFileId(getEvaluationFile().get());
             modified = true;
         }
         if (!Objects.equals(getProject().get(), v.getProject())) {
             v.setProject(getProject().get());
             modified = true;
         }
-        if (!Objects.equals(getApplicant().get(), v.getApplicant())) {
-            v.setApplicant(getApplicant().get());
+        if (!Objects.equals(getApplicant().get(), v.getApplicantId())) {
+            v.setApplicantId(getApplicant().get());
             modified = true;
         }
         if (!Objects.equals(getApplyTime().get(), v.getApplyTime())) {
             v.setApplyTime(getApplyTime().get());
             modified = true;
         }
-        if (!Objects.equals(getAuthorizer().get(), v.getAuthorizer())) {
-            v.setAuthorizer(getAuthorizer().get());
+        if (!Objects.equals(getAuthorizer().get(), v.getAuthorizerId())) {
+            v.setAuthorizerId(getAuthorizer().get());
             modified = true;
         }
         if (!Objects.equals(getAuthorizationTime().get(), v.getAuthorizationTime())) {
@@ -152,7 +149,6 @@ public class ProjectQuotationViewModel extends IdentityViewModel<ProjectQuotatio
         }
 
         {
-
             File file = null;
             if (StringUtils.hasText(v.getAuthorizationFile())) {
                 file = new File(v.getAuthorizationFile());

client/src/main/java/com/ecep/contract/vm/ProjectSaleTypeRequireFileTypeViewModel.java

@@ -3,8 +3,8 @@ package com.ecep.contract.vm;
 import java.util.Objects;
 
 import com.ecep.contract.ContractFileType;
-import com.ecep.contract.model.ProjectSaleType;
 import com.ecep.contract.model.ProjectSaleTypeRequireFileType;
+import com.ecep.contract.vo.ProjectSaleTypeRequireFileTypeVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import lombok.Data;
@@ -15,28 +15,31 @@ import lombok.EqualsAndHashCode;
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectSaleTypeRequireFileTypeViewModel extends IdentityViewModel<ProjectSaleTypeRequireFileType> {
-    private SimpleObjectProperty<ProjectSaleType> saleType = new SimpleObjectProperty<>();
+public class ProjectSaleTypeRequireFileTypeViewModel extends IdentityViewModel<ProjectSaleTypeRequireFileTypeVo> {
+    /**
+     * 销售类型,ProjectSaleType
+     */
+    private SimpleObjectProperty<Integer> saleType = new SimpleObjectProperty<>();
     private SimpleObjectProperty<ContractFileType> fileType = new SimpleObjectProperty<>();
 
-    public static ProjectSaleTypeRequireFileTypeViewModel from(ProjectSaleTypeRequireFileType entity) {
+    public static ProjectSaleTypeRequireFileTypeViewModel from(ProjectSaleTypeRequireFileTypeVo entity) {
         ProjectSaleTypeRequireFileTypeViewModel vm = new ProjectSaleTypeRequireFileTypeViewModel();
         vm.updateFrom(entity);
         return vm;
     }
 
     @Override
-    protected void updateFrom(ProjectSaleTypeRequireFileType v) {
+    protected void updateFrom(ProjectSaleTypeRequireFileTypeVo v) {
         super.updateFrom(v);
-        getSaleType().set(v.getSaleType());
+        getSaleType().set(v.getSaleTypeId());
         getFileType().set(v.getFileType());
     }
 
     @Override
-    public boolean copyTo(ProjectSaleTypeRequireFileType v) {
+    public boolean copyTo(ProjectSaleTypeRequireFileTypeVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(getSaleType().get(), v.getSaleType())) {
-            v.setSaleType(getSaleType().get());
+        if (!Objects.equals(getSaleType().get(), v.getSaleTypeId())) {
+            v.setSaleTypeId(getSaleType().get());
             modified = true;
         }
         if (!Objects.equals(getFileType().get(), v.getFileType())) {

client/src/main/java/com/ecep/contract/vm/ProjectSaleTypeViewModel.java

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.ProjectSaleType;
+import com.ecep.contract.vo.ProjectSaleTypeVo;
 
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleDoubleProperty;
@@ -14,7 +14,7 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectSaleTypeViewModel extends IdentityViewModel<ProjectSaleType> {
+public class ProjectSaleTypeViewModel extends IdentityViewModel<ProjectSaleTypeVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty path = new SimpleStringProperty();
@@ -31,14 +31,14 @@ public class ProjectSaleTypeViewModel extends IdentityViewModel<ProjectSaleType>
     private SimpleBooleanProperty active = new SimpleBooleanProperty();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    public static ProjectSaleTypeViewModel from(ProjectSaleType v) {
+    public static ProjectSaleTypeViewModel from(ProjectSaleTypeVo v) {
         ProjectSaleTypeViewModel model = new ProjectSaleTypeViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProjectSaleType v) {
+    protected void updateFrom(ProjectSaleTypeVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
@@ -51,7 +51,7 @@ public class ProjectSaleTypeViewModel extends IdentityViewModel<ProjectSaleType>
     }
 
     @Override
-    public boolean copyTo(ProjectSaleType v) {
+    public boolean copyTo(ProjectSaleTypeVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());

client/src/main/java/com/ecep/contract/vm/ProjectTypeViewModel.java

@@ -3,7 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.ProjectType;
+import com.ecep.contract.vo.ProjectTypeVo;
 
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -12,20 +12,20 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class ProjectTypeViewModel extends IdentityViewModel<ProjectType> {
+public class ProjectTypeViewModel extends IdentityViewModel<ProjectTypeVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
 
-    public static ProjectTypeViewModel from(ProjectType v) {
+    public static ProjectTypeViewModel from(ProjectTypeVo v) {
         ProjectTypeViewModel model = new ProjectTypeViewModel();
         model.update(v);
         return model;
     }
 
     @Override
-    protected void updateFrom(ProjectType v) {
+    protected void updateFrom(ProjectTypeVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
@@ -33,7 +33,7 @@ public class ProjectTypeViewModel extends IdentityViewModel<ProjectType> {
     }
 
     @Override
-    public boolean copyTo(ProjectType v) {
+    public boolean copyTo(ProjectTypeVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());

client/src/main/java/com/ecep/contract/vm/ProjectViewModel.java

@@ -1,22 +1,6 @@
 package com.ecep.contract.vm;
 
-import java.time.LocalDate;
-import java.util.Objects;
-
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.CompanyBankAccount;
-import com.ecep.contract.model.CompanyContact;
-import com.ecep.contract.model.CompanyInvoiceInfo;
-import com.ecep.contract.model.DeliverySignMethod;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.ProductType;
-import com.ecep.contract.model.ProductUsage;
-import com.ecep.contract.model.Project;
-import com.ecep.contract.model.ProjectIndustry;
-import com.ecep.contract.model.ProjectSaleType;
-import com.ecep.contract.model.ProjectType;
 import com.ecep.contract.vo.ProjectVo;
-
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -24,6 +8,9 @@ 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 ProjectViewModel extends IdentityViewModel<ProjectVo> {
@@ -31,19 +18,19 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
     /**
      * 银行账户（公司可能有多个账户，此项目关联其中一个账户）
      */
-    private SimpleObjectProperty<CompanyBankAccount> bankAccount = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> bankAccount = new SimpleObjectProperty<>();
     /**
      * 开票信息（公司可能有多个开票信息，此项目关联其中一个开票信息）
      */
-    private SimpleObjectProperty<CompanyInvoiceInfo> invoiceInfo = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> invoiceInfo = new SimpleObjectProperty<>();
     /**
      * 主联系人（公司可能有多个联系人，此项目关联其中一个为主联系人）
      */
-    private SimpleObjectProperty<CompanyContact> mainContact = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> mainContact = new SimpleObjectProperty<>();
     /**
      * 备用联系人（公司可能有多个联系人，此项目关联其中一个为备用联系人）
      */
-    private SimpleObjectProperty<CompanyContact> subContact = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> subContact = new SimpleObjectProperty<>();
 
     /**
      * 项目名称
@@ -53,12 +40,15 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
     private SimpleIntegerProperty codeYear = new SimpleIntegerProperty();
     private SimpleIntegerProperty codeSequenceNumber = new SimpleIntegerProperty();
 
-    private SimpleObjectProperty<ProjectIndustry> industry = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<ProjectSaleType> saleType = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<ProjectType> projectType = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<ProductType> productType = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<DeliverySignMethod> deliverySignMethod = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<ProductUsage> productUsage = new SimpleObjectProperty<>();
+    /**
+     * 项目行业, Industry
+     */
+    private SimpleObjectProperty<Integer> industry = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> saleType = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> projectType = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> productType = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> deliverySignMethod = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> productUsage = new SimpleObjectProperty<>();
 
     /**
      * 项目地址
@@ -71,8 +61,8 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
 
     private SimpleStringProperty path = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
-    private SimpleObjectProperty<Employee> applicant = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Employee> authorizer = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> applicant = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> authorizer = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> created = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> plannedStartTime = new SimpleObjectProperty<>();
     private SimpleObjectProperty<LocalDate> plannedCompletionTime = new SimpleObjectProperty<>();
@@ -88,11 +78,11 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
     @Override
     protected void updateFrom(ProjectVo v) {
         super.updateFrom(v);
-        customer.set(v.getCustomer());
-        bankAccount.set(v.getBankAccount());
-        invoiceInfo.set(v.getInvoiceInfo());
-        mainContact.set(v.getMainContact());
-        subContact.set(v.getSubContact());
+        customer.set(v.getCustomerId());
+        bankAccount.set(v.getBankAccountId());
+        invoiceInfo.set(v.getInvoiceInfoId());
+        mainContact.set(v.getMainContactId());
+        subContact.set(v.getSubContactId());
 
         name.set(v.getName());
         code.set(v.getCode());
@@ -103,16 +93,16 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
         useOffer.set(v.isUseOffer());
         amount.set(Objects.requireNonNullElse(v.getAmount(), 0));
         standardPayWay.set(v.isStandardPayWay());
-        industry.set(v.getIndustry());
-        saleType.set(v.getSaleType());
-        projectType.set(v.getProjectType());
-        productType.set(v.getProductType());
-        getDeliverySignMethod().set(v.getDeliverySignMethod());
-        getProductUsage().set(v.getProductUsage());
-        path.set(v.getPath());
+        industry.set(v.getIndustryId());
+        saleType.set(v.getSaleTypeId());
+        projectType.set(v.getProjectTypeId());
+        productType.set(v.getProductTypeId());
+        getDeliverySignMethod().set(v.getDeliverySignMethodId());
+        getProductUsage().set(v.getProductUsageId());
+        getPath().set(v.getPath());
         getDescription().set(v.getDescription());
-        getApplicant().set(v.getApplicant());
-        getAuthorizer().set(v.getAuthorizer());
+        getApplicant().set(v.getApplicantId());
+        getAuthorizer().set(v.getAuthorizerId());
         getCreated().set(v.getCreated());
         getPlannedStartTime().set(v.getPlannedStartTime());
         getPlannedCompletionTime().set(v.getPlannedCompletionTime());
@@ -121,25 +111,25 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
 
     public boolean copyTo(ProjectVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(customer.get(), v.getCustomer())) {
-            v.setCustomer(customer.get());
+        if (!Objects.equals(customer.get(), v.getCustomerId())) {
+            v.setCustomerId(customer.get());
             modified = true;
         }
 
-        if (!Objects.equals(bankAccount.get(), v.getBankAccount())) {
-            v.setBankAccount(bankAccount.get());
+        if (!Objects.equals(bankAccount.get(), v.getBankAccountId())) {
+            v.setBankAccountId(bankAccount.get());
             modified = true;
         }
-        if (!Objects.equals(invoiceInfo.get(), v.getInvoiceInfo())) {
-            v.setInvoiceInfo(invoiceInfo.get());
+        if (!Objects.equals(invoiceInfo.get(), v.getInvoiceInfoId())) {
+            v.setInvoiceInfoId(invoiceInfo.get());
             modified = true;
         }
-        if (!Objects.equals(mainContact.get(), v.getMainContact())) {
-            v.setMainContact(mainContact.get());
+        if (!Objects.equals(mainContact.get(), v.getMainContactId())) {
+            v.setMainContactId(mainContact.get());
             modified = true;
         }
-        if (!Objects.equals(subContact.get(), v.getSubContact())) {
-            v.setSubContact(subContact.get());
+        if (!Objects.equals(subContact.get(), v.getSubContactId())) {
+            v.setSubContactId(subContact.get());
             modified = true;
         }
 
@@ -179,28 +169,28 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
             v.setStandardPayWay(standardPayWay.get());
             modified = true;
         }
-        if (!Objects.equals(industry.get(), v.getIndustry())) {
-            v.setIndustry(industry.get());
+        if (!Objects.equals(industry.get(), v.getIndustryId())) {
+            v.setIndustryId(industry.get());
             modified = true;
         }
-        if (!Objects.equals(saleType.get(), v.getSaleType())) {
-            v.setSaleType(saleType.get());
+        if (!Objects.equals(saleType.get(), v.getSaleTypeId())) {
+            v.setSaleTypeId(saleType.get());
             modified = true;
         }
-        if (!Objects.equals(projectType.get(), v.getProjectType())) {
-            v.setProjectType(projectType.get());
+        if (!Objects.equals(projectType.get(), v.getProjectTypeId())) {
+            v.setProjectTypeId(projectType.get());
             modified = true;
         }
-        if (!Objects.equals(productType.get(), v.getProductType())) {
-            v.setProductType(productType.get());
+        if (!Objects.equals(productType.get(), v.getProductTypeId())) {
+            v.setProductTypeId(productType.get());
             modified = true;
         }
-        if (!Objects.equals(deliverySignMethod.get(), v.getDeliverySignMethod())) {
-            v.setDeliverySignMethod(deliverySignMethod.get());
+        if (!Objects.equals(deliverySignMethod.get(), v.getDeliverySignMethodId())) {
+            v.setDeliverySignMethodId(deliverySignMethod.get());
             modified = true;
         }
-        if (!Objects.equals(productUsage.get(), v.getProductUsage())) {
-            v.setProductUsage(productUsage.get());
+        if (!Objects.equals(productUsage.get(), v.getProductUsageId())) {
+            v.setProductUsageId(productUsage.get());
             modified = true;
         }
         if (!Objects.equals(path.get(), v.getPath())) {
@@ -211,12 +201,12 @@ public class ProjectViewModel extends IdentityViewModel<ProjectVo> {
             v.setDescription(description.get());
             modified = true;
         }
-        if (!Objects.equals(applicant.get(), v.getApplicant())) {
-            v.setApplicant(applicant.get());
+        if (!Objects.equals(applicant.get(), v.getApplicantId())) {
+            v.setApplicantId(applicant.get());
             modified = true;
         }
-        if (!Objects.equals(authorizer.get(), v.getAuthorizer())) {
-            v.setAuthorizer(authorizer.get());
+        if (!Objects.equals(authorizer.get(), v.getAuthorizerId())) {
+            v.setAuthorizerId(authorizer.get());
             modified = true;
         }
         if (!Objects.equals(created.get(), v.getCreated())) {

client/src/main/java/com/ecep/contract/vm/PurchaseBillVoucherItemViewModel.java

@@ -2,12 +2,7 @@ package com.ecep.contract.vm;
 
 import java.util.Objects;
 
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.Inventory;
-import com.ecep.contract.model.Invoice;
-import com.ecep.contract.model.PurchaseBillVoucher;
-import com.ecep.contract.model.PurchaseBillVoucherItem;
-import com.ecep.contract.model.PurchaseOrderItem;
+import com.ecep.contract.vo.PurchaseBillVoucherItemVo;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -18,70 +13,86 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class PurchaseBillVoucherItemViewModel extends IdentityViewModel<PurchaseBillVoucherItem> {
+public class PurchaseBillVoucherItemViewModel extends IdentityViewModel<PurchaseBillVoucherItemVo> {
 
     private SimpleIntegerProperty id = new SimpleIntegerProperty();
     private SimpleIntegerProperty refId = new SimpleIntegerProperty();
     /**
-     * 关联的销售订单
+     * 关联的采购账单凭证ID
      */
-    private SimpleObjectProperty<PurchaseBillVoucher> voucher = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<PurchaseOrderItem> orderItem = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Invoice> invoice = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Inventory> inventory = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> voucherId = new SimpleObjectProperty<>();
+    /**
+     * 关联的采购订单项ID
+     */
+    private SimpleObjectProperty<Integer> orderItemId = new SimpleObjectProperty<>();
+    /**
+     * 关联的发票ID
+     */
+    private SimpleObjectProperty<Integer> invoiceId = new SimpleObjectProperty<>();
+    /**
+     * 关联的库存ID
+     */
+    private SimpleObjectProperty<Integer> inventoryId = new SimpleObjectProperty<>();
+    /**
+     * 关联的合同ID
+     */
+    private SimpleObjectProperty<Integer> contractId = new SimpleObjectProperty<>();
 
     private SimpleDoubleProperty quantity = new SimpleDoubleProperty();
     private SimpleDoubleProperty price = new SimpleDoubleProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(PurchaseBillVoucherItem v) {
+    protected void updateFrom(PurchaseBillVoucherItemVo v) {
         super.updateFrom(v);
         getId().set(v.getId());
         getRefId().set(v.getRefId());
-        getVoucher().set(v.getVoucher());
-        getOrderItem().set(v.getOrderItem());
-        getInvoice().set(v.getInvoice());
-        getInventory().set(v.getInventory());
-        getContract().set(v.getContract());
+        getVoucherId().set(v.getVoucherId());
+        getOrderItemId().set(v.getOrderItemId());
+        getInvoiceId().set(v.getInvoiceId());
+        getInventoryId().set(v.getInventoryId());
+        getContractId().set(v.getContractId());
         getQuantity().set(v.getQuantity());
         getPrice().set(v.getPrice());
         getDescription().set(v.getDescription());
     }
 
     @Override
-    public boolean copyTo(PurchaseBillVoucherItem v) {
+    public boolean copyTo(PurchaseBillVoucherItemVo v) {
         boolean modified = super.copyTo(v);
 
         if (!Objects.equals(id.get(), v.getId())) {
             v.setId(id.get());
             modified = true;
         }
-        if (!Objects.equals(voucher.get(), v.getVoucher())) {
-            v.setVoucher(voucher.get());
-            modified = true;
-        }
-        if (!Objects.equals(orderItem.get(), v.getOrderItem())) {
-            v.setOrderItem(orderItem.get());
-            modified = true;
-        }
-        if (!Objects.equals(invoice.get(), v.getInvoice())) {
-            v.setInvoice(invoice.get());
-            modified = true;
-        }
-        if (!Objects.equals(inventory.get(), v.getInventory())) {
-            v.setInventory(inventory.get());
-            modified = true;
-        }
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
-            modified = true;
-        }
         if (!Objects.equals(refId.get(), v.getRefId())) {
             v.setRefId(refId.get());
             modified = true;
         }
+        if (!Objects.equals(voucherId.get(), v.getVoucherId())) {
+            v.setVoucherId(voucherId.get());
+            modified = true;
+        }
+
+        if (!Objects.equals(orderItemId.get(), v.getOrderItemId())) {
+            v.setOrderItemId(orderItemId.get());
+            modified = true;
+        }
+
+        if (!Objects.equals(invoiceId.get(), v.getInvoiceId())) {
+            v.setInvoiceId(invoiceId.get());
+            modified = true;
+        }
+
+        if (!Objects.equals(inventoryId.get(), v.getInventoryId())) {
+            v.setInventoryId(inventoryId.get());
+            modified = true;
+        }
+
+        if (!Objects.equals(contractId.get(), v.getContractId())) {
+            v.setContractId(contractId.get());
+            modified = true;
+        }
         if (!Objects.equals(quantity.get(), v.getQuantity())) {
             v.setQuantity(quantity.get());
             modified = true;
@@ -98,7 +109,7 @@ public class PurchaseBillVoucherItemViewModel extends IdentityViewModel<Purchase
         return modified;
     }
 
-    public static PurchaseBillVoucherItemViewModel from(PurchaseBillVoucherItem item) {
+    public static PurchaseBillVoucherItemViewModel from(PurchaseBillVoucherItemVo item) {
         PurchaseBillVoucherItemViewModel viewModel = new PurchaseBillVoucherItemViewModel();
         viewModel.update(item);
         return viewModel;

client/src/main/java/com/ecep/contract/vm/PurchaseBillVoucherViewModel.java

@@ -3,10 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.Invoice;
-import com.ecep.contract.model.PurchaseBillVoucher;
+import com.ecep.contract.vo.PurchaseBillVoucherVo;
 
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -16,45 +13,60 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class PurchaseBillVoucherViewModel extends IdentityViewModel<PurchaseBillVoucher> {
+public class PurchaseBillVoucherViewModel extends IdentityViewModel<PurchaseBillVoucherVo> {
 
-    SimpleIntegerProperty id = new SimpleIntegerProperty();
     SimpleIntegerProperty refId = new SimpleIntegerProperty();
     SimpleStringProperty code = new SimpleStringProperty();
-    SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Invoice> invoice = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> maker = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> verifier = new SimpleObjectProperty<>();
+    /**
+     * 公司， Company
+     */
+    SimpleObjectProperty<Integer> companyId = new SimpleObjectProperty<>();
+    /**
+     * 发票， Invoice
+     */
+    SimpleObjectProperty<Integer> invoiceId = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> employeeId = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> makerId = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> verifierId = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> makerDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> modifyDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> verifierDate = new SimpleObjectProperty<>();
     SimpleStringProperty description = new SimpleStringProperty();
+    // Keep original employee fields for compatibility
+    SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> maker = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> verifier = new SimpleObjectProperty<>();
 
     @Override
-    protected void updateFrom(PurchaseBillVoucher v) {
-        getId().set(v.getId());
+    protected void updateFrom(PurchaseBillVoucherVo v) {
+        super.updateFrom(v);
         getRefId().set(v.getRefId());
         getCode().set(v.getCode());
-        getCompany().set(v.getCompany());
-        getInvoice().set(v.getInvoice());
-        getEmployee().set(v.getEmployee());
-        getMaker().set(v.getMaker());
-        getVerifier().set(v.getVerifier());
+        getCompanyId().set(v.getCompanyId());
+        getInvoiceId().set(v.getInvoiceId());
+        getEmployeeId().set(v.getEmployeeId());
+        getMakerId().set(v.getMakerId());
+        getVerifierId().set(v.getVerifierId());
         getMakerDate().set(v.getMakerDate());
         getModifyDate().set(v.getModifyDate());
         getVerifierDate().set(v.getVerifierDate());
         getDescription().set(v.getDescription());
-        super.updateFrom(v);
+
+        // Map to original employee fields for compatibility
+        if (v.getEmployeeId() != null) {
+            getEmployee().set(v.getEmployeeId());
+        }
+        if (v.getMakerId() != null) {
+            getMaker().set(v.getMakerId());
+        }
+        if (v.getVerifierId() != null) {
+            getVerifier().set(v.getVerifierId());
+        }
     }
 
     @Override
-    public boolean copyTo(PurchaseBillVoucher v) {
+    public boolean copyTo(PurchaseBillVoucherVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(id.get(), v.getId())) {
-            v.setId(id.get());
-            modified = true;
-        }
         if (!Objects.equals(refId.get(), v.getRefId())) {
             v.setRefId(refId.get());
             modified = true;
@@ -63,24 +75,24 @@ public class PurchaseBillVoucherViewModel extends IdentityViewModel<PurchaseBill
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(companyId.get(), v.getCompanyId())) {
+            v.setCompanyId(companyId.get());
             modified = true;
         }
-        if (!Objects.equals(invoice.get(), v.getInvoice())) {
-            v.setInvoice(invoice.get());
+        if (!Objects.equals(invoiceId.get(), v.getInvoiceId())) {
+            v.setInvoiceId(invoiceId.get());
             modified = true;
         }
-        if (!Objects.equals(employee.get(), v.getEmployee())) {
-            v.setEmployee(employee.get());
+        if (!Objects.equals(employeeId.get(), v.getEmployeeId())) {
+            v.setEmployeeId(employeeId.get());
             modified = true;
         }
-        if (!Objects.equals(maker.get(), v.getMaker())) {
-            v.setMaker(maker.get());
+        if (!Objects.equals(makerId.get(), v.getMakerId())) {
+            v.setMakerId(makerId.get());
             modified = true;
         }
-        if (!Objects.equals(verifier.get(), v.getVerifier())) {
-            v.setVerifier(verifier.get());
+        if (!Objects.equals(verifierId.get(), v.getVerifierId())) {
+            v.setVerifierId(verifierId.get());
             modified = true;
         }
         if (!Objects.equals(makerDate.get(), v.getMakerDate())) {
@@ -102,9 +114,9 @@ public class PurchaseBillVoucherViewModel extends IdentityViewModel<PurchaseBill
         return modified;
     }
 
-    public static PurchaseBillVoucherViewModel from(PurchaseBillVoucher order) {
+    public static PurchaseBillVoucherViewModel from(PurchaseBillVoucherVo voucher) {
         PurchaseBillVoucherViewModel model = new PurchaseBillVoucherViewModel();
-        model.update(order);
+        model.update(voucher);
         return model;
     }
 }

client/src/main/java/com/ecep/contract/vm/PurchaseOrderItemViewModel.java

@@ -3,9 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.Inventory;
-import com.ecep.contract.model.PurchaseOrder;
-import com.ecep.contract.model.PurchaseOrderItem;
+import com.ecep.contract.vo.PurchaseOrderItemVo;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
@@ -16,12 +14,15 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class PurchaseOrderItemViewModel extends IdentityViewModel<PurchaseOrderItem> {
+public class PurchaseOrderItemViewModel extends IdentityViewModel<PurchaseOrderItemVo> {
     /**
-     * 关联的销售订单
+     * 关联的销售订单, PurchaseOrder
      */
-    private SimpleObjectProperty<PurchaseOrder> order = new SimpleObjectProperty<>();
-    private SimpleObjectProperty<Inventory> inventory = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> order = new SimpleObjectProperty<>();
+    /**
+     * 关联的库存, Inventory
+     */
+    private SimpleObjectProperty<Integer> inventory = new SimpleObjectProperty<>();
     private SimpleIntegerProperty refId = new SimpleIntegerProperty();
     private SimpleDoubleProperty quantity = new SimpleDoubleProperty();
     private SimpleDoubleProperty price = new SimpleDoubleProperty();
@@ -30,12 +31,11 @@ public class PurchaseOrderItemViewModel extends IdentityViewModel<PurchaseOrderI
     private SimpleObjectProperty<LocalDate> arriveDate = new SimpleObjectProperty<>();
     private SimpleStringProperty description = new SimpleStringProperty();
 
-
     @Override
-    protected void updateFrom(PurchaseOrderItem v) {
+    protected void updateFrom(PurchaseOrderItemVo v) {
         super.updateFrom(v);
         getOrder().set(v.getOrder());
-        getInventory().set(v.getInventory());
+        getInventory().set(v.getInventoryId());
         getRefId().set(v.getRefId());
         getQuantity().set(v.getQuantity());
         getPrice().set(v.getPrice());
@@ -44,18 +44,17 @@ public class PurchaseOrderItemViewModel extends IdentityViewModel<PurchaseOrderI
         getArriveDate().set(v.getArriveDate());
         getDescription().set(v.getDescription());
 
-
     }
 
     @Override
-    public boolean copyTo(PurchaseOrderItem v) {
+    public boolean copyTo(PurchaseOrderItemVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(order.get(), v.getOrder())) {
             v.setOrder(order.get());
             modified = true;
         }
-        if (!Objects.equals(inventory.get(), v.getInventory())) {
-            v.setInventory(inventory.get());
+        if (!Objects.equals(inventory.get(), v.getInventoryId())) {
+            v.setInventoryId(inventory.get());
             modified = true;
         }
         if (!Objects.equals(refId.get(), v.getRefId())) {
@@ -90,7 +89,7 @@ public class PurchaseOrderItemViewModel extends IdentityViewModel<PurchaseOrderI
         return modified;
     }
 
-    public static PurchaseOrderItemViewModel from(PurchaseOrderItem item) {
+    public static PurchaseOrderItemViewModel from(PurchaseOrderItemVo item) {
         PurchaseOrderItemViewModel viewModel = new PurchaseOrderItemViewModel();
         viewModel.update(item);
         return viewModel;

client/src/main/java/com/ecep/contract/vm/PurchaseOrderViewModel.java

@@ -1,12 +1,13 @@
 package com.ecep.contract.vm;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Objects;
 
-import com.ecep.contract.model.Contract;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.PurchaseOrder;
+import com.ecep.contract.vo.PurchaseOrderVo;
 
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -15,14 +16,24 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrder> {
+public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrderVo> {
     SimpleIntegerProperty refId = new SimpleIntegerProperty();
-    SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> contractId = new SimpleObjectProperty<>();
     SimpleStringProperty code = new SimpleStringProperty();
-    SimpleObjectProperty<Employee> maker = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> verifier = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> closer = new SimpleObjectProperty<>();
+    SimpleStringProperty name = new SimpleStringProperty();
+    SimpleObjectProperty<Integer> vendorId = new SimpleObjectProperty<>();
+    SimpleObjectProperty<LocalDate> orderDate = new SimpleObjectProperty<>();
+    SimpleDoubleProperty totalAmount = new SimpleDoubleProperty();
+    SimpleDoubleProperty taxAmount = new SimpleDoubleProperty();
+    SimpleDoubleProperty taxRate = new SimpleDoubleProperty();
+    SimpleIntegerProperty statusId = new SimpleIntegerProperty();
+    SimpleStringProperty remark = new SimpleStringProperty();
+    SimpleBooleanProperty active = new SimpleBooleanProperty();
+    // 保留原有的员工相关字段
+    SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> maker = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> verifier = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> closer = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> makerDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> modifyDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> verifierDate = new SimpleObjectProperty<>();
@@ -30,76 +41,117 @@ public class PurchaseOrderViewModel extends IdentityViewModel<PurchaseOrder> {
     SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(PurchaseOrder v) {
+    protected void updateFrom(PurchaseOrderVo v) {
         super.updateFrom(v);
-        getRefId().set(v.getRefId());
-        getContract().set(v.getContract());
-        getEmployee().set(v.getEmployee());
+        getRefId().set(v.getId());
+        if (v.getContractId() != null) {
+            getContractId().set(v.getContractId());
+        }
         getCode().set(v.getCode());
-        getMaker().set(v.getMaker());
-        getVerifier().set(v.getVerifier());
-        getCloser().set(v.getCloser());
-        getMakerDate().set(v.getMakerDate());
-        getModifyDate().set(v.getModifyDate());
-        getVerifierDate().set(v.getVerifierDate());
-        getCloserDate().set(v.getCloserDate());
-        getDescription().set(v.getDescription());
-        super.updateFrom(v);
+        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());
+        }
+        if (getMaker() != null && getMaker().get() != null) {
+            getMaker().set(getMaker().get());
+        }
+        if (getVerifier() != null && getVerifier().get() != null) {
+            getVerifier().set(getVerifier().get());
+        }
+        if (getCloser() != null && getCloser().get() != null) {
+            getCloser().set(getCloser().get());
+        }
+        if (getMakerDate() != null && getMakerDate().get() != null) {
+            getMakerDate().set(getMakerDate().get());
+        }
+        if (getModifyDate() != null && getModifyDate().get() != null) {
+            getModifyDate().set(getModifyDate().get());
+        }
+        if (getVerifierDate() != null && getVerifierDate().get() != null) {
+            getVerifierDate().set(getVerifierDate().get());
+        }
+        if (getCloserDate() != null && getCloserDate().get() != null) {
+            getCloserDate().set(getCloserDate().get());
+        }
+        if (getDescription() != null && getDescription().get() != null) {
+            getDescription().set(getDescription().get());
+        }
     }
 
     @Override
-    public boolean copyTo(PurchaseOrder v) {
+    public boolean copyTo(PurchaseOrderVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(refId.get(), v.getRefId())) {
-            v.setRefId(refId.get());
+        if (!Objects.equals(refId.get(), v.getId())) {
+            v.setId(refId.get());
             modified = true;
         }
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
+        if (!Objects.equals(contractId.get(), v.getContractId())) {
+            v.setContractId(contractId.get());
             modified = true;
         }
-
         if (!Objects.equals(code.get(), v.getCode())) {
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(maker.get(), v.getMaker())) {
-            v.setMaker(maker.get());
+        if (!Objects.equals(name.get(), v.getName())) {
+            v.setName(name.get());
             modified = true;
         }
-        if (!Objects.equals(verifier.get(), v.getVerifier())) {
-            v.setVerifier(verifier.get());
+        if (!Objects.equals(vendorId.get(), v.getVendorId())) {
+            v.setVendorId(vendorId.get());
             modified = true;
         }
-        if (!Objects.equals(closer.get(), v.getCloser())) {
-            v.setCloser(closer.get());
+        if (!Objects.equals(orderDate.get(), v.getOrderDate())) {
+            v.setOrderDate(orderDate.get());
             modified = true;
         }
-        if (!Objects.equals(makerDate.get(), v.getMakerDate())) {
-            v.setMakerDate(makerDate.get());
+        if (!Objects.equals(totalAmount.get(), v.getTotalAmount())) {
+            v.setTotalAmount(totalAmount.get());
             modified = true;
         }
-        if (!Objects.equals(modifyDate.get(), v.getModifyDate())) {
-            v.setModifyDate(modifyDate.get());
+        if (!Objects.equals(taxAmount.get(), v.getTaxAmount())) {
+            v.setTaxAmount(taxAmount.get());
             modified = true;
         }
-        if (!Objects.equals(verifierDate.get(), v.getVerifierDate())) {
-            v.setVerifierDate(verifierDate.get());
+        if (!Objects.equals(taxRate.get(), v.getTaxRate())) {
+            v.setTaxRate(taxRate.get());
             modified = true;
         }
-        if (!Objects.equals(closerDate.get(), v.getCloserDate())) {
-            v.setCloserDate(closerDate.get());
+        if (!Objects.equals(statusId.get(), v.getStatusId())) {
+            v.setStatusId(statusId.get());
             modified = true;
         }
-
-        if (!Objects.equals(description.get(), v.getDescription())) {
-            v.setDescription(description.get());
+        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());
             modified = true;
         }
         return modified;
     }
 
-    public static PurchaseOrderViewModel from(PurchaseOrder order) {
+    public static PurchaseOrderViewModel from(PurchaseOrderVo order) {
         PurchaseOrderViewModel model = new PurchaseOrderViewModel();
         model.update(order);
         return model;

client/src/main/java/com/ecep/contract/vm/SalesBillVoucherViewModel.java

@@ -1,46 +1,45 @@
 package com.ecep.contract.vm;
 
-import java.time.LocalDateTime;
-import java.util.Objects;
-
-import com.ecep.contract.model.Company;
-import com.ecep.contract.model.Employee;
-import com.ecep.contract.model.SalesBillVoucher;
-import com.ecep.contract.model.SalesOrder;
-
+import com.ecep.contract.vo.SalesBillVoucherVo;
 import javafx.beans.property.SimpleIntegerProperty;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDateTime;
+import java.util.Objects;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SalesBillVoucherViewModel extends IdentityViewModel<SalesBillVoucher> {
+public class SalesBillVoucherViewModel extends IdentityViewModel<SalesBillVoucherVo> {
 
     SimpleIntegerProperty id = new SimpleIntegerProperty();
     SimpleIntegerProperty refId = new SimpleIntegerProperty();
     SimpleStringProperty code = new SimpleStringProperty();
-    SimpleObjectProperty<Company> company = new SimpleObjectProperty<>();
-    SimpleObjectProperty<SalesOrder> order = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> maker = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> verifier = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> company = new SimpleObjectProperty<>();
+    /**
+     * SaleOrder
+     */
+    SimpleObjectProperty<Integer> order = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> maker = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> verifier = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> makerDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> modifyDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDateTime> verifierDate = new SimpleObjectProperty<>();
     SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(SalesBillVoucher v) {
+    protected void updateFrom(SalesBillVoucherVo v) {
         getId().set(v.getId());
         getRefId().set(v.getRefId());
         getCode().set(v.getCode());
-        getCompany().set(v.getCompany());
-        getOrder().set(v.getOrder());
-        getEmployee().set(v.getEmployee());
-        getMaker().set(v.getMaker());
-        getVerifier().set(v.getVerifier());
+        getCompany().set(v.getCompanyId());
+        getOrder().set(v.getOrderId());
+        getEmployee().set(v.getEmployeeId());
+        getMaker().set(v.getMakerId());
+        getVerifier().set(v.getVerifierId());
         getMakerDate().set(v.getMakerDate());
         getModifyDate().set(v.getModifyDate());
         getVerifierDate().set(v.getVerifierDate());
@@ -49,7 +48,7 @@ public class SalesBillVoucherViewModel extends IdentityViewModel<SalesBillVouche
     }
 
     @Override
-    public boolean copyTo(SalesBillVoucher v) {
+    public boolean copyTo(SalesBillVoucherVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(id.get(), v.getId())) {
             v.setId(id.get());
@@ -63,24 +62,24 @@ public class SalesBillVoucherViewModel extends IdentityViewModel<SalesBillVouche
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(company.get(), v.getCompany())) {
-            v.setCompany(company.get());
+        if (!Objects.equals(company.get(), v.getCompanyId())) {
+            v.setCompanyId(company.get());
             modified = true;
         }
-        if (!Objects.equals(order.get(), v.getOrder())) {
-            v.setOrder(order.get());
+        if (!Objects.equals(order.get(), v.getOrderId())) {
+            v.setOrderId(order.get());
             modified = true;
         }
-        if (!Objects.equals(employee.get(), v.getEmployee())) {
-            v.setEmployee(employee.get());
+        if (!Objects.equals(employee.get(), v.getEmployeeId())) {
+            v.setEmployeeId(employee.get());
             modified = true;
         }
-        if (!Objects.equals(maker.get(), v.getMaker())) {
-            v.setMaker(maker.get());
+        if (!Objects.equals(maker.get(), v.getMakerId())) {
+            v.setMakerId(maker.get());
             modified = true;
         }
-        if (!Objects.equals(verifier.get(), v.getVerifier())) {
-            v.setVerifier(verifier.get());
+        if (!Objects.equals(verifier.get(), v.getVerifierId())) {
+            v.setVerifierId(verifier.get());
             modified = true;
         }
         if (!Objects.equals(makerDate.get(), v.getMakerDate())) {
@@ -102,7 +101,7 @@ public class SalesBillVoucherViewModel extends IdentityViewModel<SalesBillVouche
         return modified;
     }
 
-    public static SalesBillVoucherViewModel from(SalesBillVoucher order) {
+    public static SalesBillVoucherViewModel from(SalesBillVoucherVo order) {
         SalesBillVoucherViewModel model = new SalesBillVoucherViewModel();
         model.update(order);
         return model;

client/src/main/java/com/ecep/contract/vm/SalesOrderItemViewModel.java

@@ -3,8 +3,7 @@ package com.ecep.contract.vm;
 import java.time.LocalDate;
 import java.util.Objects;
 
-import com.ecep.contract.model.SalesOrder;
-import com.ecep.contract.model.SalesOrderItem;
+import com.ecep.contract.vo.SalesOrderItemVo;
 
 import javafx.beans.property.SimpleDoubleProperty;
 import javafx.beans.property.SimpleObjectProperty;
@@ -14,11 +13,11 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItem> {
+public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItemVo> {
     /**
      * 关联的销售订单
      */
-    private SimpleObjectProperty<SalesOrder> order = new SimpleObjectProperty<>();
+    private SimpleObjectProperty<Integer> order = new SimpleObjectProperty<>();
 
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty name = new SimpleStringProperty();
@@ -31,9 +30,9 @@ public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItem> {
     private SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(SalesOrderItem v) {
+    protected void updateFrom(SalesOrderItemVo v) {
         super.updateFrom(v);
-        getOrder().set(v.getOrder());
+        getOrder().set(v.getSalesOrderId());
         getCode().set(v.getCode());
         getName().set(v.getName());
         getQuantity().set(v.getQuantity());
@@ -46,10 +45,10 @@ public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItem> {
     }
 
     @Override
-    public boolean copyTo(SalesOrderItem v) {
+    public boolean copyTo(SalesOrderItemVo v) {
         boolean modified = super.copyTo(v);
-        if (!Objects.equals(order.get(), v.getOrder())) {
-            v.setOrder(order.get());
+        if (!Objects.equals(order.get(), v.getSalesOrderId())) {
+            v.setSalesOrderId(order.get());
             modified = true;
         }
         if (!Objects.equals(code.get(), v.getCode())) {
@@ -96,9 +95,8 @@ public class SalesOrderItemViewModel extends IdentityViewModel<SalesOrderItem> {
         return modified;
     }
 
-    public static SalesOrderItemViewModel from(SalesOrderItem item) {
+    public static SalesOrderItemViewModel from(SalesOrderItemVo item) {
         SalesOrderItemViewModel viewModel = new SalesOrderItemViewModel();
-        // viewModel.updateFrom(item);
         viewModel.update(item);
         return viewModel;
     }

client/src/main/java/com/ecep/contract/vm/SalesOrderViewModel.java

@@ -7,6 +7,7 @@ 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;
 import javafx.beans.property.SimpleObjectProperty;
 import javafx.beans.property.SimpleStringProperty;
@@ -15,46 +16,46 @@ import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class SalesOrderViewModel extends IdentityViewModel<SalesOrder> {
+public class SalesOrderViewModel extends IdentityViewModel<SalesOrderVo> {
 
     SimpleIntegerProperty id = new SimpleIntegerProperty();
-    SimpleObjectProperty<Contract> contract = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> employee = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> contract = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> employee = new SimpleObjectProperty<>();
     SimpleStringProperty code = new SimpleStringProperty();
-    SimpleObjectProperty<Employee> maker = new SimpleObjectProperty<>();
-    SimpleObjectProperty<Employee> verifier = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> maker = new SimpleObjectProperty<>();
+    SimpleObjectProperty<Integer> verifier = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> makerDate = new SimpleObjectProperty<>();
     SimpleObjectProperty<LocalDate> verifierDate = new SimpleObjectProperty<>();
     SimpleStringProperty description = new SimpleStringProperty();
 
     @Override
-    protected void updateFrom(SalesOrder v) {
+    protected void updateFrom(SalesOrderVo v) {
         getId().set(v.getId());
-        getContract().set(v.getContract());
-        getEmployee().set(v.getEmployee());
+        getContract().set(v.getContractId());
+        getEmployee().set(v.getEmployeeId());
         getCode().set(v.getCode());
-        getMaker().set(v.getMaker());
-        getVerifier().set(v.getVerifier());
+        getMaker().set(v.getMakerId());
+        getVerifier().set(v.getVerifierId());
         getMakerDate().set(v.getMakerDate());
         getVerifierDate().set(v.getVerifierDate());
         super.updateFrom(v);
     }
 
     @Override
-    public boolean copyTo(SalesOrder v) {
+    public boolean copyTo(SalesOrderVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(id.get(), v.getId())) {
             v.setId(id.get());
             modified = true;
         }
 
-        if (!Objects.equals(contract.get(), v.getContract())) {
-            v.setContract(contract.get());
+        if (!Objects.equals(contract.get(), v.getContractId())) {
+            v.setContractId(contract.get());
             modified = true;
         }
 
-        if (!Objects.equals(employee.get(), v.getEmployee())) {
-            v.setEmployee(employee.get());
+        if (!Objects.equals(employee.get(), v.getEmployeeId())) {
+            v.setEmployeeId(employee.get());
             modified = true;
         }
 
@@ -62,16 +63,16 @@ public class SalesOrderViewModel extends IdentityViewModel<SalesOrder> {
             v.setCode(code.get());
             modified = true;
         }
-        if (!Objects.equals(maker.get(), v.getMaker())) {
-            v.setMaker(maker.get());
+        if (!Objects.equals(maker.get(), v.getMakerId())) {
+            v.setMakerId(maker.get());
             modified = true;
         }
         if (!Objects.equals(makerDate.get(), v.getMakerDate())) {
             v.setMakerDate(makerDate.get());
             modified = true;
         }
-        if (!Objects.equals(verifier.get(), v.getVerifier())) {
-            v.setVerifier(verifier.get());
+        if (!Objects.equals(verifier.get(), v.getVerifierId())) {
+            v.setVerifierId(verifier.get());
             modified = true;
         }
         if (!Objects.equals(verifierDate.get(), v.getVerifierDate())) {
@@ -86,7 +87,7 @@ public class SalesOrderViewModel extends IdentityViewModel<SalesOrder> {
         return modified;
     }
 
-    public static SalesOrderViewModel from(SalesOrder order) {
+    public static SalesOrderViewModel from(SalesOrderVo order) {
         SalesOrderViewModel model = new SalesOrderViewModel();
         model.update(order);
         return model;

client/src/main/java/com/ecep/contract/vm/UnitViewModel.java

@@ -0,0 +1,41 @@
+package com.ecep.contract.vm;
+
+import com.ecep.contract.UnitType;
+import com.ecep.contract.vo.UnitVo;
+
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleDoubleProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class UnitViewModel extends IdentityViewModel<UnitVo> {
+    private SimpleStringProperty code = new SimpleStringProperty();
+    private SimpleStringProperty name = new SimpleStringProperty();
+    private SimpleObjectProperty<UnitType> unitType = new SimpleObjectProperty<>();
+    private SimpleDoubleProperty ratio = new SimpleDoubleProperty();
+    private SimpleBooleanProperty standard = new SimpleBooleanProperty();
+    private SimpleStringProperty description = new SimpleStringProperty();
+    private SimpleBooleanProperty active = new SimpleBooleanProperty();
+
+    public static UnitViewModel from(UnitVo v) {
+        UnitViewModel vm = new UnitViewModel();
+        vm.update(v);
+        return vm;
+    }
+
+    @Override
+    protected void updateFrom(UnitVo v) {
+        super.updateFrom(v);
+        getCode().set(v.getCode());
+        getName().set(v.getName());
+        getUnitType().set(v.getUnitType());
+        getRatio().set(v.getRatio());
+        getStandard().set(v.isStandard());
+        getDescription().set(v.getDescription());
+        getActive().set(v.isActive());
+    }
+}

client/src/main/java/com/ecep/contract/vm/VendorCatalogViewModel.java

@@ -0,0 +1,50 @@
+package com.ecep.contract.vm;
+
+import java.util.Objects;
+
+import com.ecep.contract.VendorType;
+import com.ecep.contract.vo.VendorCatalogVo;
+
+import javafx.beans.property.SimpleBooleanProperty;
+import javafx.beans.property.SimpleObjectProperty;
+import javafx.beans.property.SimpleStringProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class VendorCatalogViewModel extends IdentityViewModel<VendorCatalogVo> {
+    private SimpleStringProperty name = new SimpleStringProperty();
+    private SimpleStringProperty code = new SimpleStringProperty();
+    private SimpleObjectProperty<VendorType> type = new SimpleObjectProperty<>();
+    private SimpleStringProperty description = new SimpleStringProperty();
+    private SimpleBooleanProperty active = new SimpleBooleanProperty();
+
+    @Override
+    protected void updateFrom(VendorCatalogVo v) {
+        super.updateFrom(v);
+        name.set(v.getName());
+        code.set(v.getCode());
+        type.set(v.getType());
+        description.set(v.getDescription());
+    }
+
+    @Override
+    public boolean copyTo(VendorCatalogVo v) {
+        boolean ret = super.copyTo(v);
+        if (!Objects.equals(v.getName(), name.get())) {
+            v.setName(name.get());
+        }
+        if (!Objects.equals(v.getCode(), code.get())) {
+            v.setCode(code.get());
+        }
+        if (!Objects.equals(v.getType(), type.get())) {
+            v.setType(type.get());
+        }
+        if (!Objects.equals(v.getDescription(), description.get())) {
+            v.setDescription(description.get());
+        }
+        return ret;
+    }
+
+}

client/src/main/java/com/ecep/contract/vm/VendorGroupViewModel.java

@@ -1,17 +1,17 @@
 package com.ecep.contract.vm;
 
-import java.util.Objects;
-
 import com.ecep.contract.model.VendorGroup;
-
+import com.ecep.contract.vo.VendorGroupVo;
 import javafx.beans.property.SimpleBooleanProperty;
 import javafx.beans.property.SimpleStringProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Objects;
+
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class VendorGroupViewModel extends IdentityViewModel<VendorGroup> {
+public class VendorGroupViewModel extends IdentityViewModel<VendorGroupVo> {
     private SimpleStringProperty name = new SimpleStringProperty();
     private SimpleStringProperty code = new SimpleStringProperty();
     private SimpleStringProperty description = new SimpleStringProperty();
@@ -26,14 +26,14 @@ public class VendorGroupViewModel extends IdentityViewModel<VendorGroup> {
      */
     private SimpleBooleanProperty canPrePurchase = new SimpleBooleanProperty();
 
-    public static VendorGroupViewModel from(VendorGroup v) {
+    public static VendorGroupViewModel from(VendorGroupVo v) {
         VendorGroupViewModel vm = new VendorGroupViewModel();
         vm.updateFrom(v);
         return vm;
     }
 
     @Override
-    protected void updateFrom(VendorGroup v) {
+    protected void updateFrom(VendorGroupVo v) {
         super.updateFrom(v);
         getName().set(v.getName());
         getCode().set(v.getCode());
@@ -45,7 +45,7 @@ public class VendorGroupViewModel extends IdentityViewModel<VendorGroup> {
     }
 
     @Override
-    public boolean copyTo(VendorGroup v) {
+    public boolean copyTo(VendorGroupVo v) {
         boolean modified = super.copyTo(v);
         if (!Objects.equals(getName().get(), v.getName())) {
             v.setName(getName().get());