diff --git a/common/src/main/java/com/ecep/contract/model/Company.java b/server/src/main/java/com/ecep/contract/ds/company/model/Company.java similarity index 97% rename from common/src/main/java/com/ecep/contract/model/Company.java rename to server/src/main/java/com/ecep/contract/ds/company/model/Company.java index b9f7b40..6dc8ae8 100644 --- a/common/src/main/java/com/ecep/contract/model/Company.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/Company.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -28,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY") @ToString -public class Company implements IdentityEntity, NamedEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class Company implements IdentityEntity, NamedEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyBankAccount.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyBankAccount.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/CompanyBankAccount.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyBankAccount.java index f30151b..2f3c7d2 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyBankAccount.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyBankAccount.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; @@ -22,8 +21,7 @@ import lombok.ToString; @Setter @jakarta.persistence.Entity @Table(name = "COMPANY_BANK_ACCOUNT", schema = "supplier_ms") -public class CompanyBankAccount implements IdentityEntity, BasedEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyBankAccount implements IdentityEntity, BasedEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyBasedEntity.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyBasedEntity.java similarity index 100% rename from common/src/main/java/com/ecep/contract/model/CompanyBasedEntity.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyBasedEntity.java diff --git a/common/src/main/java/com/ecep/contract/model/CompanyBlackReason.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyBlackReason.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CompanyBlackReason.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyBlackReason.java index 77ca6a0..a9a1b96 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyBlackReason.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyBlackReason.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -34,8 +33,7 @@ import lombok.Setter; }) // @org.springframework.data.relational.core.mapping.Table("COMPANY_BLACK_REASON") @JsonIgnoreProperties(ignoreUnknown = true) -public class CompanyBlackReason implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyBlackReason implements IdentityEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyContact.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyContact.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/CompanyContact.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyContact.java index 7a290e9..c1c3857 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyContact.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyContact.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -31,8 +30,7 @@ import lombok.ToString; @Index(name = "CUSTOMER_ID", columnList = "COMPANY_ID") }) @ToString -public class CompanyContact implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyContact implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyExtendInfo.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyExtendInfo.java similarity index 91% rename from common/src/main/java/com/ecep/contract/model/CompanyExtendInfo.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyExtendInfo.java index c363c2c..a37e53a 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyExtendInfo.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyExtendInfo.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import org.hibernate.annotations.ColumnDefault; @@ -27,8 +26,8 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_EXTEND_INFO", schema = "supplier_ms") @ToString -public class CompanyExtendInfo implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyExtendInfo + implements IdentityEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyFile.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyFile.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CompanyFile.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyFile.java index db80092..8c07924 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyFile.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyFile.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -31,8 +30,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_FILE") @ToString -public class CompanyFile implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyFile implements IdentityEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyInvoiceInfo.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyInvoiceInfo.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/CompanyInvoiceInfo.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyInvoiceInfo.java index 12fa79d..cfe8616 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyInvoiceInfo.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyInvoiceInfo.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; @@ -27,8 +26,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_INVOICE_INFO", schema = "supplier_ms") @ToString -public class CompanyInvoiceInfo implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyInvoiceInfo implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyOldName.java b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyOldName.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CompanyOldName.java rename to server/src/main/java/com/ecep/contract/ds/company/model/CompanyOldName.java index c11cd36..8e6ea59 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyOldName.java +++ b/server/src/main/java/com/ecep/contract/ds/company/model/CompanyOldName.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -25,8 +24,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_OLDNAME") @ToString -public class CompanyOldName implements IdentityEntity, NamedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyOldName implements IdentityEntity, NamedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyContract.java b/server/src/main/java/com/ecep/contract/ds/contract/model/CompanyContract.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CompanyContract.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/CompanyContract.java index b17c940..721506b 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyContract.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/model/CompanyContract.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Map; import java.util.Objects; @@ -32,8 +31,7 @@ import lombok.ToString; }) @ToString(exclude = { "company", "contract" }) -public class CompanyContract implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyContract implements IdentityEntity, CompanyBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/Contract.java b/server/src/main/java/com/ecep/contract/ds/contract/model/Contract.java similarity index 98% rename from common/src/main/java/com/ecep/contract/model/Contract.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/Contract.java index c7d8306..377c4b5 100644 --- a/common/src/main/java/com/ecep/contract/model/Contract.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/model/Contract.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -37,8 +36,7 @@ import lombok.ToString; @Table(name = "CONTRACT", schema = "supplier_ms") @ToString public class Contract - implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; + implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Voable { /** * 主键 */ diff --git a/common/src/main/java/com/ecep/contract/model/ContractBasedEntity.java b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractBasedEntity.java similarity index 100% rename from common/src/main/java/com/ecep/contract/model/ContractBasedEntity.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/ContractBasedEntity.java diff --git a/common/src/main/java/com/ecep/contract/model/ContractBidVendor.java b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractBidVendor.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/ContractBidVendor.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/ContractBidVendor.java index b325875..0fdebc9 100644 --- a/common/src/main/java/com/ecep/contract/model/ContractBidVendor.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractBidVendor.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; @@ -29,8 +28,7 @@ import lombok.ToString; }) @ToString -public class ContractBidVendor implements IdentityEntity, ContractBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ContractBidVendor implements IdentityEntity, ContractBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ContractFile.java b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractFile.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/ContractFile.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/ContractFile.java index 582d9f6..d00e69b 100644 --- a/common/src/main/java/com/ecep/contract/model/ContractFile.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractFile.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -32,8 +31,7 @@ import lombok.ToString; @Entity @Table(name = "CONTRACT_FILE") @ToString -public class ContractFile implements IdentityEntity, ContractBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ContractFile implements IdentityEntity, ContractBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ContractItem.java b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractItem.java similarity index 97% rename from common/src/main/java/com/ecep/contract/model/ContractItem.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/ContractItem.java index 5c8e983..7371244 100644 --- a/common/src/main/java/com/ecep/contract/model/ContractItem.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractItem.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -30,8 +29,7 @@ import lombok.ToString; @Table(name = "CONTRACT_ITEM") @ToString public class ContractItem - implements IdentityEntity, ContractBasedEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; + implements IdentityEntity, ContractBasedEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ContractPayPlan.java b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractPayPlan.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/ContractPayPlan.java rename to server/src/main/java/com/ecep/contract/ds/contract/model/ContractPayPlan.java index 2926fa7..9c4638e 100644 --- a/common/src/main/java/com/ecep/contract/model/ContractPayPlan.java +++ b/server/src/main/java/com/ecep/contract/ds/contract/model/ContractPayPlan.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -28,8 +27,7 @@ import lombok.Setter; @Entity @Table(name = "CONTRACT_PAY_PLAN", schema = "supplier_ms", indexes = { }) -public class ContractPayPlan implements IdentityEntity, ContractBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ContractPayPlan implements IdentityEntity, ContractBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyCustomer.java b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomer.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CompanyCustomer.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomer.java index d793230..0975767 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyCustomer.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomer.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -29,8 +28,7 @@ import lombok.ToString; }) @ToString -public class CompanyCustomer implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyCustomer implements IdentityEntity, CompanyBasedEntity, Voable { @Id @Column(name = "ID", nullable = false) private Integer id; diff --git a/common/src/main/java/com/ecep/contract/model/CompanyCustomerEntity.java b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerEntity.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/CompanyCustomerEntity.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerEntity.java index 8a83bd1..cecef6d 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyCustomerEntity.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerEntity.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -28,8 +27,7 @@ import lombok.ToString; }) @ToString -public class CompanyCustomerEntity implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyCustomerEntity implements IdentityEntity, Voable { @Id @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyCustomerEvaluationFormFile.java b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerEvaluationFormFile.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CompanyCustomerEvaluationFormFile.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerEvaluationFormFile.java index 3631265..aab019d 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyCustomerEvaluationFormFile.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerEvaluationFormFile.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; @@ -30,8 +29,7 @@ import lombok.ToString; @Setter @ToString @Table(name = "COMPANY_CUSTOMER_EVALUATION_FORM_FILE") -public class CompanyCustomerEvaluationFormFile implements IdentityEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyCustomerEvaluationFormFile implements IdentityEntity, BasedEntity, Voable { @Id @Column(name = "ID", nullable = false) private Integer id; diff --git a/common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerFile.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerFile.java index ced54f2..8c431c4 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyCustomerFile.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerFile.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -28,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_CUSTOMER_FILE") @ToString -public class CompanyCustomerFile implements CompanyBasicFile, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyCustomerFile implements CompanyBasicFile, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CompanyCustomerFileTypeLocal.java b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerFileTypeLocal.java similarity index 53% rename from common/src/main/java/com/ecep/contract/model/CompanyCustomerFileTypeLocal.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerFileTypeLocal.java index 8a70438..a17c825 100644 --- a/common/src/main/java/com/ecep/contract/model/CompanyCustomerFileTypeLocal.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/CompanyCustomerFileTypeLocal.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.CustomerFileType; @@ -18,26 +17,8 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_CUSTOMER_FILE_TYPE_LOCAL") @ToString(callSuper = true) -public class CompanyCustomerFileTypeLocal extends BaseEnumEntity implements Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CompanyCustomerFileTypeLocal extends BaseEnumEntity implements Voable { - @Override - public final boolean equals(Object object) { - if (this == object) - return true; - if (object == null) - return false; - if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) { - return false; - } - CompanyCustomerFileTypeLocal that = (CompanyCustomerFileTypeLocal) object; - return getId() != null && Objects.equals(getId(), that.getId()); - } - - @Override - public final int hashCode() { - return HibernateProxyUtils.hashCode(this); - } @Override public CompanyCustomerFileTypeLocalVo toVo() { diff --git a/common/src/main/java/com/ecep/contract/model/CustomerSatisfactionSurvey.java b/server/src/main/java/com/ecep/contract/ds/customer/model/CustomerSatisfactionSurvey.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/CustomerSatisfactionSurvey.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/CustomerSatisfactionSurvey.java index ffb1c16..3437368 100644 --- a/common/src/main/java/com/ecep/contract/model/CustomerSatisfactionSurvey.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/CustomerSatisfactionSurvey.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -29,8 +28,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT_CUSTOMER_SATISFACTION_SURVEY", schema = "supplier_ms") @ToString -public class CustomerSatisfactionSurvey implements IdentityEntity, ProjectBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CustomerSatisfactionSurvey implements IdentityEntity, ProjectBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/SalesBillVoucher.java b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesBillVoucher.java similarity index 97% rename from common/src/main/java/com/ecep/contract/model/SalesBillVoucher.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/SalesBillVoucher.java index b43731e..87939d3 100644 --- a/common/src/main/java/com/ecep/contract/model/SalesBillVoucher.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesBillVoucher.java @@ -28,8 +28,7 @@ import lombok.ToString; @Entity @Table(name = "SALES_BILL_VOUCHER", schema = "supplier_ms") @ToString -public class SalesBillVoucher implements IdentityEntity, BasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; +public class SalesBillVoucher implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/SalesBillVoucherItem.java b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesBillVoucherItem.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/SalesBillVoucherItem.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/SalesBillVoucherItem.java index 3673963..d321538 100644 --- a/common/src/main/java/com/ecep/contract/model/SalesBillVoucherItem.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesBillVoucherItem.java @@ -27,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "SALES_BILL_VOUCHER_ITEM", schema = "supplier_ms") @ToString -public class SalesBillVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; +public class SalesBillVoucherItem implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/SalesOrder.java b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrder.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/SalesOrder.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrder.java index 778555e..f21760e 100644 --- a/common/src/main/java/com/ecep/contract/model/SalesOrder.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrder.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -29,9 +28,7 @@ import lombok.ToString; @Entity @Table(name = "CONTRACT_SALES_ORDER", schema = "supplier_ms") @ToString -public class SalesOrder - implements IdentityEntity, BasedEntity, ContractBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class SalesOrder implements IdentityEntity, BasedEntity, ContractBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/SalesOrderInvoice.java b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrderInvoice.java similarity index 86% rename from common/src/main/java/com/ecep/contract/model/SalesOrderInvoice.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrderInvoice.java index d883cfc..ec3195b 100644 --- a/common/src/main/java/com/ecep/contract/model/SalesOrderInvoice.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrderInvoice.java @@ -5,7 +5,6 @@ import jakarta.persistence.*; import lombok.*; import org.hibernate.proxy.HibernateProxy; -import java.io.Serializable; import java.util.Objects; /** @@ -17,8 +16,7 @@ import java.util.Objects; @Entity @Table(name = "SALES_ORDER_INVOICE", schema = "supplier_ms") @ToString -public class SalesOrderInvoice implements IdentityEntity, Serializable { - private static final long serialVersionUID = 1L; +public class SalesOrderInvoice implements IdentityEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/SalesOrderItem.java b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrderItem.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/SalesOrderItem.java rename to server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrderItem.java index 1c1e55c..70d14a2 100644 --- a/common/src/main/java/com/ecep/contract/model/SalesOrderItem.java +++ b/server/src/main/java/com/ecep/contract/ds/customer/model/SalesOrderItem.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -29,8 +28,7 @@ import lombok.ToString; @Entity @Table(name = "CONTRACT_SALES_ORDER_ITEM", schema = "supplier_ms") @ToString -public class SalesOrderItem implements IdentityEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class SalesOrderItem implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/CloudRk.java b/server/src/main/java/com/ecep/contract/ds/other/model/CloudRk.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/CloudRk.java rename to server/src/main/java/com/ecep/contract/ds/other/model/CloudRk.java index f43b36b..f8bae9b 100644 --- a/common/src/main/java/com/ecep/contract/model/CloudRk.java +++ b/server/src/main/java/com/ecep/contract/ds/other/model/CloudRk.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDateTime; import java.util.Objects; @@ -26,8 +25,7 @@ import lombok.ToString; @Setter @Entity @Table(name = "CLOUD_RK", schema = "supplier_ms") -public class CloudRk implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CloudRk implements IdentityEntity, Voable { /** * 主键 diff --git a/common/src/main/java/com/ecep/contract/model/CloudTyc.java b/server/src/main/java/com/ecep/contract/ds/other/model/CloudTyc.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/CloudTyc.java rename to server/src/main/java/com/ecep/contract/ds/other/model/CloudTyc.java index fb4ab0f..fbfe5b7 100644 --- a/common/src/main/java/com/ecep/contract/model/CloudTyc.java +++ b/server/src/main/java/com/ecep/contract/ds/other/model/CloudTyc.java @@ -1,7 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; -import java.time.Instant; import java.time.LocalDateTime; import java.util.Objects; @@ -28,8 +26,7 @@ import lombok.ToString; @Setter @Entity @Table(name = "CLOUD_TYC", schema = "supplier_ms") -public class CloudTyc implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CloudTyc implements IdentityEntity, Voable { /** * 主键 */ diff --git a/common/src/main/java/com/ecep/contract/model/CloudYu.java b/server/src/main/java/com/ecep/contract/ds/other/model/CloudYu.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/CloudYu.java rename to server/src/main/java/com/ecep/contract/ds/other/model/CloudYu.java index 9f12528..6ca4d63 100644 --- a/common/src/main/java/com/ecep/contract/model/CloudYu.java +++ b/server/src/main/java/com/ecep/contract/ds/other/model/CloudYu.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -28,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "CLOUD_YU", schema = "supplier_ms") @ToString -public class CloudYu implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class CloudYu implements IdentityEntity, Voable { /** * 主键 */ diff --git a/common/src/main/java/com/ecep/contract/model/Invoice.java b/server/src/main/java/com/ecep/contract/ds/other/model/Invoice.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/Invoice.java rename to server/src/main/java/com/ecep/contract/ds/other/model/Invoice.java index b64d860..ac36240 100644 --- a/common/src/main/java/com/ecep/contract/model/Invoice.java +++ b/server/src/main/java/com/ecep/contract/ds/other/model/Invoice.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; @@ -30,8 +29,7 @@ import lombok.ToString; @Entity @Table(name = "INVOICE", schema = "supplier_ms") @ToString -public class Invoice implements IdentityEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class Invoice implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/ProductType.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProductType.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/ProductType.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProductType.java index e9dc74a..7d3a1ee 100644 --- a/common/src/main/java/com/ecep/contract/model/ProductType.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProductType.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.util.HibernateProxyUtils; @@ -22,8 +21,7 @@ import lombok.Setter; @Setter @Entity @Table(name = "PRODUCT_TYPE") -public class ProductType implements BasedEntity, IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProductType implements BasedEntity, IdentityEntity, Voable { @Id @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/ProductUsage.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProductUsage.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/ProductUsage.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProductUsage.java index 2158285..30bfd11 100644 --- a/common/src/main/java/com/ecep/contract/model/ProductUsage.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProductUsage.java @@ -22,8 +22,7 @@ import lombok.Setter; @Setter @Entity @Table(name = "PRODUCT_USAGE", schema = "supplier_ms") -public class ProductUsage implements BasedEntity, IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProductUsage implements BasedEntity, IdentityEntity, Voable { @Id @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/Project.java b/server/src/main/java/com/ecep/contract/ds/project/model/Project.java similarity index 98% rename from common/src/main/java/com/ecep/contract/model/Project.java rename to server/src/main/java/com/ecep/contract/ds/project/model/Project.java index 608ac87..48c8e01 100644 --- a/common/src/main/java/com/ecep/contract/model/Project.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/Project.java @@ -1,9 +1,9 @@ -package com.ecep.contract.model; +package com.ecep.contract.ds.project.model; -import java.io.Serializable; import java.time.LocalDate; import java.util.Objects; +import com.ecep.contract.model.*; import org.hibernate.annotations.ColumnDefault; import com.ecep.contract.util.HibernateProxyUtils; @@ -31,8 +31,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT", schema = "supplier_ms") @ToString -public class Project implements IdentityEntity, NamedEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class Project implements IdentityEntity, NamedEntity, BasedEntity, Voable { @Id @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectBasedEntity.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectBasedEntity.java similarity index 100% rename from common/src/main/java/com/ecep/contract/model/ProjectBasedEntity.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectBasedEntity.java diff --git a/common/src/main/java/com/ecep/contract/model/ProjectBid.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectBid.java similarity index 97% rename from common/src/main/java/com/ecep/contract/model/ProjectBid.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectBid.java index 7b4f773..072eb26 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectBid.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectBid.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDateTime; import java.util.Objects; @@ -32,8 +31,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT_BID") @ToString -public class ProjectBid implements IdentityEntity, ProjectBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProjectBid implements IdentityEntity, ProjectBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectCost.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectCost.java similarity index 98% rename from common/src/main/java/com/ecep/contract/model/ProjectCost.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectCost.java index 3d2c5cb..d64f288 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectCost.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectCost.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDateTime; import java.util.Objects; @@ -27,8 +26,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT_COST") @ToString -public class ProjectCost implements IdentityEntity, ProjectBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProjectCost implements IdentityEntity, ProjectBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectCostItem.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectCostItem.java similarity index 97% rename from common/src/main/java/com/ecep/contract/model/ProjectCostItem.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectCostItem.java index 65ea1a7..033740f 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectCostItem.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectCostItem.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDateTime; import java.util.Objects; @@ -25,8 +24,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT_COST_ITEM") @ToString -public class ProjectCostItem implements IdentityEntity, BasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProjectCostItem implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectFile.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectFile.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/ProjectFile.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectFile.java index 65b9ab8..565afab 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectFile.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectFile.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.ProjectFileType; @@ -30,8 +29,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT_FILE") @ToString -public class ProjectFile implements IdentityEntity, ProjectBasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProjectFile implements IdentityEntity, ProjectBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectFundPlan.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectFundPlan.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/ProjectFundPlan.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectFundPlan.java index e6fb6d2..17dd262 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectFundPlan.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectFundPlan.java @@ -34,8 +34,7 @@ import lombok.ToString; @Table(name = "PROJECT_FUND_PLAN") @ToString public class ProjectFundPlan - implements IdentityEntity, ProjectBasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; + implements IdentityEntity, ProjectBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectIndustry.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectIndustry.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/ProjectIndustry.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectIndustry.java index eabc668..3a99260 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectIndustry.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectIndustry.java @@ -26,8 +26,7 @@ import lombok.ToString; }) @ToString -public class ProjectIndustry implements BasedEntity, IdentityEntity, NamedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProjectIndustry implements BasedEntity, IdentityEntity, NamedEntity, Voable { @Id @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/common/src/main/java/com/ecep/contract/model/ProjectQuotation.java b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectQuotation.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/ProjectQuotation.java rename to server/src/main/java/com/ecep/contract/ds/project/model/ProjectQuotation.java index cffb3ed..6ad88b1 100644 --- a/common/src/main/java/com/ecep/contract/model/ProjectQuotation.java +++ b/server/src/main/java/com/ecep/contract/ds/project/model/ProjectQuotation.java @@ -31,9 +31,7 @@ import lombok.ToString; @Entity @Table(name = "PROJECT_QUOTATION") @ToString -public class ProjectQuotation - implements IdentityEntity, ProjectBasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ProjectQuotation implements IdentityEntity, ProjectBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/ExtendVendorInfo.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/ExtendVendorInfo.java similarity index 90% rename from common/src/main/java/com/ecep/contract/model/ExtendVendorInfo.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/ExtendVendorInfo.java index 6b3b3e5..53b7c61 100644 --- a/common/src/main/java/com/ecep/contract/model/ExtendVendorInfo.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/ExtendVendorInfo.java @@ -2,13 +2,11 @@ package com.ecep.contract.model; import com.ecep.contract.util.HibernateProxyUtils; import com.ecep.contract.vo.ExtendVendorInfoVo; -import com.ecep.contract.model.Voable; import jakarta.persistence.*; import lombok.Getter; import lombok.Setter; import lombok.ToString; -import java.io.Serializable; import java.util.Objects; @Getter @@ -16,8 +14,7 @@ import java.util.Objects; @Entity @Table(name = "CONTRACT_EXTEND_VENDOR_INFO", schema = "supplier_ms") @ToString -public class ExtendVendorInfo implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class ExtendVendorInfo implements IdentityEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseBillVoucher.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseBillVoucher.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/PurchaseBillVoucher.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseBillVoucher.java index 4273d82..90491bf 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseBillVoucher.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseBillVoucher.java @@ -29,8 +29,7 @@ import lombok.ToString; @Table(name = "PURCHASE_BILL_VOUCHER", schema = "supplier_ms") @ToString public class PurchaseBillVoucher - implements IdentityEntity, BasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; + implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseBillVoucherItem.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseBillVoucherItem.java similarity index 95% rename from common/src/main/java/com/ecep/contract/model/PurchaseBillVoucherItem.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseBillVoucherItem.java index accd245..39b512f 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseBillVoucherItem.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseBillVoucherItem.java @@ -28,8 +28,7 @@ import lombok.ToString; @Table(name = "PURCHASE_BILL_VOUCHER_ITEM", schema = "supplier_ms") @ToString public class PurchaseBillVoucherItem - implements IdentityEntity, BasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; + implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseOrder.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseOrder.java similarity index 97% rename from common/src/main/java/com/ecep/contract/model/PurchaseOrder.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseOrder.java index f4b86f7..485a93a 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseOrder.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseOrder.java @@ -29,8 +29,7 @@ import lombok.ToString; @Table(name = "PURCHASE_ORDER", schema = "supplier_ms") @ToString public class PurchaseOrder - implements IdentityEntity, BasedEntity, ContractBasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; + implements IdentityEntity, BasedEntity, ContractBasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseOrderItem.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseOrderItem.java similarity index 94% rename from common/src/main/java/com/ecep/contract/model/PurchaseOrderItem.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseOrderItem.java index 7352427..851a45c 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseOrderItem.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseOrderItem.java @@ -28,9 +28,7 @@ import lombok.ToString; @Entity @Table(name = "PURCHASE_ORDER_ITEM", schema = "supplier_ms") @ToString -public class PurchaseOrderItem - implements IdentityEntity, BasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; +public class PurchaseOrderItem implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseReceipt.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseReceipt.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/PurchaseReceipt.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseReceipt.java index 66ef95d..85adf4e 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseReceipt.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseReceipt.java @@ -27,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "PURCHASE_RECEIPT", schema = "supplier_ms") @ToString -public class PurchaseReceipt implements IdentityEntity, BasedEntity, java.io.Serializable { - private static final long serialVersionUID = 1L; +public class PurchaseReceipt implements IdentityEntity, BasedEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucher.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseSettlementVoucher.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucher.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseSettlementVoucher.java index 2fb2343..f2dfe1a 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucher.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseSettlementVoucher.java @@ -27,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "PURCHASE_SETTLE_VOUCHER", schema = "supplier_ms") @ToString -public class PurchaseSettlementVoucher implements IdentityEntity, BasedEntity, java.io.Serializable { - private static final long serialVersionUID = 1L; +public class PurchaseSettlementVoucher implements IdentityEntity, BasedEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucherItem.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseSettlementVoucherItem.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucherItem.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseSettlementVoucherItem.java index f87efde..08f40c1 100644 --- a/common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucherItem.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/PurchaseSettlementVoucherItem.java @@ -27,8 +27,7 @@ import lombok.ToString; @Entity @Table(name = "PURCHASE_SETTLE_VOUCHER_ITEM", schema = "supplier_ms") @ToString -public class PurchaseSettlementVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable, Voable { - private static final long serialVersionUID = 1L; +public class PurchaseSettlementVoucherItem implements IdentityEntity, BasedEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/common/src/main/java/com/ecep/contract/model/Vendor.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/Vendor.java similarity index 96% rename from common/src/main/java/com/ecep/contract/model/Vendor.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/Vendor.java index 1c40e7e..0e27607 100644 --- a/common/src/main/java/com/ecep/contract/model/Vendor.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/Vendor.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.List; @@ -34,8 +33,7 @@ import lombok.ToString; @Entity @Table(name = "COMPANY_VENDOR", schema = "supplier_ms") @ToString -public class Vendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class Vendor implements IdentityEntity, CompanyBasedEntity, Voable { @Id @Column(name = "ID", nullable = false) private Integer id; diff --git a/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/VendorApprovedItem.java similarity index 92% rename from common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/VendorApprovedItem.java index caedcaf..2bfda0d 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorApprovedItem.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/VendorApprovedItem.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.util.Objects; import com.ecep.contract.VendorType; @@ -22,42 +21,45 @@ import lombok.ToString; /** * 供方名录里的供应商 + * + * @see VendorApproved + * @see VendorApprovedFile */ @Getter @Setter @Entity @Table(name = "COMPANY_VENDOR_APPROVED_ITEM") @ToString -public class VendorApprovedItem implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class VendorApprovedItem implements IdentityEntity, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) private Integer id; - + /** + * 所属名录ID + */ @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "LIST_ID", nullable = false) @ToString.Exclude private VendorApproved list; - /** * 供应商名称,有可能改名了,所以存历史名称 */ @Column(name = "VENDOR_NAME") private String vendorName; - + /** + * 供应商 + */ @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "VENDOR_ID", nullable = false) @ToString.Exclude private Vendor vendor; - /** * 类型,历史的,可能会变更的,所以这样也要存 */ @Column(name = "TYPE") private VendorType type; - /** * 备注 */ diff --git a/common/src/main/java/com/ecep/contract/model/VendorEntity.java b/server/src/main/java/com/ecep/contract/ds/vendor/model/VendorEntity.java similarity index 93% rename from common/src/main/java/com/ecep/contract/model/VendorEntity.java rename to server/src/main/java/com/ecep/contract/ds/vendor/model/VendorEntity.java index c5f4331..608a654 100644 --- a/common/src/main/java/com/ecep/contract/model/VendorEntity.java +++ b/server/src/main/java/com/ecep/contract/ds/vendor/model/VendorEntity.java @@ -1,6 +1,5 @@ package com.ecep.contract.model; -import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; import java.util.Objects; @@ -31,8 +30,10 @@ import lombok.ToString; }) @ToString -public class VendorEntity implements IdentityEntity, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class VendorEntity implements IdentityEntity, Voable { + /** + * 主键ID + */ @Id @Column(name = "ID", nullable = false) @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -42,10 +43,14 @@ public class VendorEntity implements IdentityEntity, Serializable, Voable, Serializable, Voable { - private static final long serialVersionUID = 1L; +public class VendorFile implements CompanyBasicFile, Voable { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "ID", nullable = false) diff --git a/server/src/main/java/com/ecep/contract/service/tasker/CompanyRkUpdateTasker.java b/server/src/main/java/com/ecep/contract/service/tasker/CompanyRkUpdateTasker.java new file mode 100644 index 0000000..342d294 --- /dev/null +++ b/server/src/main/java/com/ecep/contract/service/tasker/CompanyRkUpdateTasker.java @@ -0,0 +1,4 @@ +package com.ecep.contract.service.tasker; + +public class CompanyRkUpdateTasker { +}