refactor(model): 重构模型类包结构并优化序列化处理
重构模型类包结构,将模型类按功能模块划分到不同的子包中。优化序列化处理,为VO类添加serialVersionUID并实现Serializable接口。移除部分冗余的serialVersionUID字段,简化模型类代码。同时修复UITools中空值处理的问题,并更新pom版本至0.0.100-SNAPSHOT。 - 将模型类按功能模块划分到ds子包中 - 为VO类添加序列化支持 - 移除冗余的serialVersionUID字段 - 修复UITools空值处理问题 - 更新项目版本号
This commit is contained in:
@@ -6,12 +6,12 @@
|
||||
<parent>
|
||||
<groupId>com.ecep.contract</groupId>
|
||||
<artifactId>Contract-Manager</artifactId>
|
||||
<version>0.0.99-SNAPSHOT</version>
|
||||
<version>0.0.100-SNAPSHOT</version>
|
||||
</parent>
|
||||
|
||||
<groupId>com.ecep.contract</groupId>
|
||||
<artifactId>common</artifactId>
|
||||
<version>0.0.99-SNAPSHOT</version>
|
||||
<version>0.0.100-SNAPSHOT</version>
|
||||
|
||||
<properties>
|
||||
<maven.compiler.source>${java.version}</maven.compiler.source>
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
@@ -15,20 +14,29 @@ import jakarta.persistence.Table;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
/**
|
||||
* 银行实体类
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "BANK", schema = "supplier_ms")
|
||||
public class Bank implements BasedEntity, IdentityEntity, Serializable, Voable<BankVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Bank implements BasedEntity, IdentityEntity, Voable<BankVo> {
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 银行编码
|
||||
*/
|
||||
@Column(name = "CODE")
|
||||
private String code;
|
||||
|
||||
/**
|
||||
* 银行名称
|
||||
*/
|
||||
@Column(name = "NAME")
|
||||
private String name;
|
||||
|
||||
|
||||
@@ -1,18 +1,14 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.EnumType;
|
||||
import jakarta.persistence.Enumerated;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.MappedSuperclass;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.*;
|
||||
import org.hibernate.proxy.HibernateProxy;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
@Getter
|
||||
@Setter
|
||||
@RequiredArgsConstructor
|
||||
@MappedSuperclass
|
||||
@ToString
|
||||
public abstract class BaseEnumEntity<T extends Enum<?>> implements IdentityEntity {
|
||||
@@ -34,5 +30,19 @@ public abstract class BaseEnumEntity<T extends Enum<?>> implements IdentityEntit
|
||||
@Column(name = "VALUE")
|
||||
private String value;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object o) {
|
||||
if (this == o) return true;
|
||||
if (o == null) return false;
|
||||
Class<?> oEffectiveClass = o instanceof HibernateProxy ? ((HibernateProxy) o).getHibernateLazyInitializer().getPersistentClass() : o.getClass();
|
||||
Class<?> thisEffectiveClass = this instanceof HibernateProxy ? ((HibernateProxy) this).getHibernateLazyInitializer().getPersistentClass() : this.getClass();
|
||||
if (thisEffectiveClass != oEffectiveClass) return false;
|
||||
BaseEnumEntity<?> that = (BaseEnumEntity<?>) o;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return this instanceof HibernateProxy ? ((HibernateProxy) this).getHibernateLazyInitializer().getPersistentClass().hashCode() : getClass().hashCode();
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.CompanyFileType;
|
||||
@@ -18,26 +17,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "COMPANY_FILE_TYPE_LOCAL")
|
||||
@ToString
|
||||
public class CompanyFileTypeLocal extends BaseEnumEntity<CompanyFileType> implements Serializable, Voable<CompanyFileTypeLocalVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object object) {
|
||||
if (this == object)
|
||||
return true;
|
||||
if (object == null)
|
||||
return false;
|
||||
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
|
||||
return false;
|
||||
}
|
||||
CompanyFileTypeLocal that = (CompanyFileTypeLocal) object;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return HibernateProxyUtils.hashCode(this);
|
||||
}
|
||||
public class CompanyFileTypeLocal extends BaseEnumEntity<CompanyFileType> implements Voable<CompanyFileTypeLocalVo> {
|
||||
|
||||
@Override
|
||||
public CompanyFileTypeLocalVo toVo() {
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
@@ -24,8 +23,7 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "CONTRACT_CATALOG", schema = "supplier_ms")
|
||||
public class ContractCatalog implements IdentityEntity, NamedEntity, Serializable, Voable<ContractCatalogVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class ContractCatalog implements IdentityEntity, NamedEntity, Voable<ContractCatalogVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.ContractFileType;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.vo.ContractFileTypeLocalVo;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
@@ -22,8 +18,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "CONTRACT_FILE_TYPE_LOCAL")
|
||||
@ToString(callSuper = true)
|
||||
public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> implements Serializable, Voable<ContractFileTypeLocalVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> implements Voable<ContractFileTypeLocalVo> {
|
||||
/**
|
||||
* 建议的文件名
|
||||
*/
|
||||
@@ -33,24 +28,6 @@ public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> impl
|
||||
@Column(name = "DESCRIPTION")
|
||||
private String description;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object object) {
|
||||
if (this == object)
|
||||
return true;
|
||||
if (object == null)
|
||||
return false;
|
||||
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
|
||||
return false;
|
||||
}
|
||||
ContractFileTypeLocal that = (ContractFileTypeLocal) object;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return HibernateProxyUtils.hashCode(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ContractFileTypeLocalVo toVo() {
|
||||
ContractFileTypeLocalVo vo = new ContractFileTypeLocalVo();
|
||||
|
||||
@@ -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 = "CONTRACT_GROUP", schema = "supplier_ms")
|
||||
public class ContractGroup implements IdentityEntity, NamedEntity, Serializable, Voable<ContractGroupVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class ContractGroup implements IdentityEntity, NamedEntity, Voable<ContractGroupVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
@@ -24,8 +23,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "CONTRACT_KIND", schema = "supplier_ms")
|
||||
@ToString
|
||||
public class ContractKind implements IdentityEntity, NamedEntity, Serializable, Voable<ContractKindVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class ContractKind implements IdentityEntity, NamedEntity, Voable<ContractKindVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
@@ -24,8 +23,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "CONTRACT_TYPE", schema = "supplier_ms")
|
||||
@ToString
|
||||
public class ContractType implements IdentityEntity, NamedEntity, Serializable, Voable<ContractTypeVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class ContractType implements IdentityEntity, NamedEntity, Voable<ContractTypeVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
@@ -24,8 +23,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "CUSTOMER_CATALOG", schema = "supplier_ms")
|
||||
@ToString
|
||||
public class CustomerCatalog implements BasedEntity, IdentityEntity, Serializable, Voable<CustomerCatalogVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class CustomerCatalog implements BasedEntity, IdentityEntity, Voable<CustomerCatalogVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.CustomerFileType;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.vo.CustomerFileTypeLocalVo;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -19,30 +15,9 @@ import lombok.ToString;
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "CUSTOMER_FILE_TYPE_LOCAL")
|
||||
@Table(name = "COMPANY_CUSTOMER_FILE_TYPE_LOCAL")
|
||||
@ToString(callSuper = true)
|
||||
public class CustomerFileTypeLocal extends BaseEnumEntity<CustomerFileType> implements Serializable, Voable<CustomerFileTypeLocalVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object object) {
|
||||
if (this == object) {
|
||||
return true;
|
||||
}
|
||||
if (object == null) {
|
||||
return false;
|
||||
}
|
||||
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
|
||||
return false;
|
||||
}
|
||||
CustomerFileTypeLocal that = (CustomerFileTypeLocal) object;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return HibernateProxyUtils.hashCode(this);
|
||||
}
|
||||
public class CustomerFileTypeLocal extends BaseEnumEntity<CustomerFileType> implements Voable<CustomerFileTypeLocalVo> {
|
||||
|
||||
@Override
|
||||
public CustomerFileTypeLocalVo toVo() {
|
||||
|
||||
@@ -26,8 +26,7 @@ import lombok.ToString;
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "PRODUCT_DELIVERY_SIGN_METHOD", schema = "supplier_ms")
|
||||
public class DeliverySignMethod implements BasedEntity, IdentityEntity , Serializable, Voable<DeliverySignMethodVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class DeliverySignMethod implements BasedEntity, IdentityEntity, Voable<DeliverySignMethodVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -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 = "DEPARTMENT", schema = "supplier_ms")
|
||||
public class Department implements BasedEntity, IdentityEntity, Serializable, Voable<DepartmentVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Department implements BasedEntity, IdentityEntity, Voable<DepartmentVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -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;
|
||||
@Setter
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "EMPLOYEE", schema = "supplier_ms")
|
||||
public class Employee implements BasedEntity, IdentityEntity, NamedEntity, Serializable, Voable<EmployeeVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Employee implements BasedEntity, IdentityEntity, NamedEntity, Voable<EmployeeVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -23,8 +22,7 @@ import lombok.ToString;
|
||||
@Setter
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "EMPLOYEE_AUTH_BIND", schema = "supplier_ms")
|
||||
public class EmployeeAuthBind implements BasedEntity, IdentityEntity, Serializable, Voable<EmployeeAuthBindVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class EmployeeAuthBind implements BasedEntity, IdentityEntity, Voable<EmployeeAuthBindVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -22,9 +21,7 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "EMPLOYEE_LOGIN_HISTORY", schema = "supplier_ms")
|
||||
public class EmployeeLoginHistory implements BasedEntity, IdentityEntity, Serializable, Voable<EmployeeLoginHistoryVo> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class EmployeeLoginHistory implements BasedEntity, IdentityEntity, Voable<EmployeeLoginHistoryVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Objects;
|
||||
@@ -27,9 +26,7 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "EMPLOYEE_ROLE", schema = "supplier_ms")
|
||||
public class EmployeeRole implements IdentityEntity, NamedEntity, Serializable, Voable<EmployeeRoleVo> {
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class EmployeeRole implements IdentityEntity, NamedEntity, Voable<EmployeeRoleVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
@@ -18,9 +17,9 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "FUNC", schema = "supplier_ms")
|
||||
public class Function implements IdentityEntity, NamedEntity, Serializable, Voable<FunctionVo> {
|
||||
public class Function implements IdentityEntity, NamedEntity, Voable<FunctionVo> {
|
||||
|
||||
|
||||
private static final long serialVersionUID = 1L;
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -3,13 +3,11 @@ package com.ecep.contract.model;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.MonthDay;
|
||||
|
||||
@Embeddable
|
||||
@Data
|
||||
public class HistoryPrice implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class HistoryPrice {
|
||||
/**
|
||||
* 税率,1% =1,100% =100
|
||||
*/
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -22,8 +21,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "HOLIDAY_TABLE")
|
||||
@ToString
|
||||
public class HolidayTable implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class HolidayTable {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@JdbcTypeCode(SqlTypes.DATE)
|
||||
|
||||
@@ -2,7 +2,15 @@ package com.ecep.contract.model;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 实体对象接口
|
||||
*/
|
||||
public interface IdentityEntity {
|
||||
/**
|
||||
* 获取ID
|
||||
*
|
||||
* @return ID
|
||||
*/
|
||||
Integer getId();
|
||||
|
||||
void setId(Integer id);
|
||||
|
||||
@@ -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;
|
||||
@@ -9,6 +8,7 @@ import com.ecep.contract.model.Voable;
|
||||
import com.ecep.contract.vo.InventoryVo;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
|
||||
import com.ecep.contract.vo.VolumeSizeVo;
|
||||
import jakarta.persistence.AttributeOverride;
|
||||
import jakarta.persistence.AttributeOverrides;
|
||||
import jakarta.persistence.Column;
|
||||
@@ -32,8 +32,7 @@ import lombok.ToString;
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "INVENTORY", schema = "supplier_ms")
|
||||
public class Inventory implements IdentityEntity, BasedEntity, Serializable, Voable<InventoryVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Inventory implements IdentityEntity, BasedEntity, Voable<InventoryVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
@@ -237,14 +236,14 @@ public class Inventory implements IdentityEntity, BasedEntity, Serializable, Voa
|
||||
vo.setSalePrice(salePrice);
|
||||
|
||||
// 体积尺寸属性映射
|
||||
VolumeSize volumeSize = new VolumeSize();
|
||||
VolumeSizeVo volumeSize = new VolumeSizeVo();
|
||||
volumeSize.setVolume(this.getVolumeSize().getVolume());
|
||||
volumeSize.setLength(this.getVolumeSize().getLength());
|
||||
volumeSize.setWidth(this.getVolumeSize().getWidth());
|
||||
volumeSize.setHeight(this.getVolumeSize().getHeight());
|
||||
vo.setVolumeSize(volumeSize);
|
||||
|
||||
VolumeSize packagedVolumeSize = new VolumeSize();
|
||||
|
||||
VolumeSizeVo packagedVolumeSize = new VolumeSizeVo();
|
||||
packagedVolumeSize.setVolume(this.getPackagedVolumeSize().getVolume());
|
||||
packagedVolumeSize.setLength(this.getPackagedVolumeSize().getLength());
|
||||
packagedVolumeSize.setWidth(this.getPackagedVolumeSize().getWidth());
|
||||
|
||||
@@ -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 = "INVENTORY_CATALOG", schema = "supplier_ms")
|
||||
public class InventoryCatalog implements IdentityEntity, BasedEntity, Serializable, Voable<InventoryCatalogVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class InventoryCatalog implements IdentityEntity, BasedEntity, Voable<InventoryCatalogVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.Year;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -28,8 +27,7 @@ import lombok.ToString;
|
||||
@ToString
|
||||
@Entity
|
||||
@Table(name = "INVENTORY_HISTORY", schema = "supplier_ms")
|
||||
public class InventoryHistoryPrice implements IdentityEntity, Serializable, Voable<InventoryHistoryPriceVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class InventoryHistoryPrice implements IdentityEntity, Voable<InventoryHistoryPriceVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -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 = "PERMISSION", schema = "supplier_ms")
|
||||
public class Permission implements IdentityEntity, NamedEntity, Serializable, Voable<PermissionVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Permission implements IdentityEntity, NamedEntity, Voable<PermissionVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,13 +1,13 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import jakarta.persistence.Embeddable;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Embeddable
|
||||
@Data
|
||||
public class Price implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 税率,1% =1,100% =100
|
||||
*/
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.ProjectFileType;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.vo.ProjectFileTypeLocalVo;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -18,28 +15,7 @@ import lombok.ToString;
|
||||
@Table(name = "PROJECT_FILE_TYPE_LOCAL")
|
||||
@ToString
|
||||
public class ProjectFileTypeLocal extends BaseEnumEntity<ProjectFileType>
|
||||
implements java.io.Serializable, Voable<ProjectFileTypeLocalVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object object) {
|
||||
if (this == object) {
|
||||
return true;
|
||||
}
|
||||
if (object == null) {
|
||||
return false;
|
||||
}
|
||||
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
|
||||
return false;
|
||||
}
|
||||
ProjectFileTypeLocal that = (ProjectFileTypeLocal) object;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return HibernateProxyUtils.hashCode(this);
|
||||
}
|
||||
implements Voable<ProjectFileTypeLocalVo> {
|
||||
|
||||
@Override
|
||||
public ProjectFileTypeLocalVo toVo() {
|
||||
|
||||
@@ -1,20 +1,13 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.vo.ProjectSaleTypeVo;
|
||||
|
||||
import jakarta.persistence.Column;
|
||||
import jakarta.persistence.Entity;
|
||||
import jakarta.persistence.GeneratedValue;
|
||||
import jakarta.persistence.GenerationType;
|
||||
import jakarta.persistence.Id;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* 销售类型
|
||||
*/
|
||||
@@ -23,8 +16,7 @@ import lombok.Setter;
|
||||
@Entity
|
||||
@Table(name = "PROJECT_SALE_TYPE")
|
||||
public class ProjectSaleType
|
||||
implements IdentityEntity, NamedEntity, BasedEntity, Serializable, Voable<ProjectSaleTypeVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
implements IdentityEntity, NamedEntity, BasedEntity, Voable<ProjectSaleTypeVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -28,8 +28,7 @@ import lombok.ToString;
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "PROJECT_SALE_TYPE_REQ_FILE_TYPE")
|
||||
public class ProjectSaleTypeRequireFileType implements IdentityEntity, BasedEntity, java.io.Serializable , Voable<ProjectSaleTypeRequireFileTypeVo>{
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class ProjectSaleTypeRequireFileType implements IdentityEntity, BasedEntity, Voable<ProjectSaleTypeRequireFileTypeVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@@ -80,9 +79,9 @@ public class ProjectSaleTypeRequireFileType implements IdentityEntity, BasedEnti
|
||||
public ProjectSaleTypeRequireFileTypeVo toVo() {
|
||||
ProjectSaleTypeRequireFileTypeVo vo = new ProjectSaleTypeRequireFileTypeVo();
|
||||
vo.setId(id);
|
||||
vo.setSaleTypeId(saleType.getId());
|
||||
vo.setSaleTypeId(saleType == null ? null : saleType.getId());
|
||||
vo.setFileType(fileType);
|
||||
vo.setFrequency(frequency.name());
|
||||
vo.setFrequency(frequency == null ? null : frequency.name());
|
||||
return vo;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -22,8 +22,7 @@ import lombok.Setter;
|
||||
@Entity
|
||||
@Table(name = "PROJECT_TYPE")
|
||||
public class ProjectType
|
||||
implements IdentityEntity, NamedEntity, BasedEntity, java.io.Serializable, Voable<ProjectTypeVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
implements IdentityEntity, NamedEntity, BasedEntity, Voable<ProjectTypeVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -19,8 +18,7 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "SYS_CONF", schema = "supplier_ms")
|
||||
public class SysConf implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class SysConf {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
private String id;
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.UnitType;
|
||||
@@ -24,8 +23,7 @@ import lombok.Setter;
|
||||
@Setter
|
||||
@jakarta.persistence.Entity
|
||||
@Table(name = "UNIT", schema = "supplier_ms")
|
||||
public class Unit implements IdentityEntity, NamedEntity, Serializable, Voable<UnitVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class Unit implements IdentityEntity, NamedEntity, Voable<UnitVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.util.Objects;
|
||||
|
||||
@@ -18,17 +17,18 @@ import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
/**
|
||||
* 合格供应商名录
|
||||
* 合格供方名录
|
||||
* 每年一条记录
|
||||
* 下有 item 和 file
|
||||
* @see VendorApprovedItem
|
||||
* @see VendorApprovedFile
|
||||
*/
|
||||
@Getter
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "COMPANY_VENDOR_APPROVED")
|
||||
@ToString
|
||||
public class VendorApproved implements IdentityEntity, Serializable, Voable<VendorApprovedVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class VendorApproved implements IdentityEntity, Voable<VendorApprovedVo> {
|
||||
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -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_VENDOR_APPROVED_FILE")
|
||||
@ToString
|
||||
public class VendorApprovedFile implements IdentityEntity, Serializable, Voable<VendorApprovedFileVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class VendorApprovedFile implements IdentityEntity, Voable<VendorApprovedFileVo> {
|
||||
@Id
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.VendorType;
|
||||
@@ -25,8 +24,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "VENDOR_CATALOG", schema = "supplier_ms")
|
||||
@ToString
|
||||
public class VendorCatalog implements BasedEntity, IdentityEntity, Serializable, Voable<VendorCatalogVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class VendorCatalog implements BasedEntity, IdentityEntity, Voable<VendorCatalogVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.VendorFileType;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.vo.VendorFileTypeLocalVo;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -21,26 +17,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "COMPANY_VENDOR_FILE_TYPE_LOCAL")
|
||||
@ToString
|
||||
public class VendorFileTypeLocal extends BaseEnumEntity<VendorFileType> implements Serializable, Voable<VendorFileTypeLocalVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object object) {
|
||||
if (this == object)
|
||||
return true;
|
||||
if (object == null)
|
||||
return false;
|
||||
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
|
||||
return false;
|
||||
}
|
||||
VendorFileTypeLocal that = (VendorFileTypeLocal) object;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return HibernateProxyUtils.hashCode(this);
|
||||
}
|
||||
public class VendorFileTypeLocal extends BaseEnumEntity<VendorFileType> implements Voable<VendorFileTypeLocalVo> {
|
||||
|
||||
@Override
|
||||
public VendorFileTypeLocalVo toVo() {
|
||||
|
||||
@@ -8,7 +8,6 @@ import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.ToString;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
@@ -19,8 +18,7 @@ import java.util.Objects;
|
||||
@Entity
|
||||
@Table(name = "VENDOR_GROUP", schema = "supplier_ms")
|
||||
@ToString
|
||||
public class VendorGroup implements IdentityEntity, NamedEntity, BasedEntity, Serializable, Voable<VendorGroupVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class VendorGroup implements IdentityEntity, NamedEntity, BasedEntity, Voable<VendorGroupVo> {
|
||||
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
|
||||
@@ -1,6 +1,5 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.ContractFileType;
|
||||
@@ -30,8 +29,7 @@ import lombok.ToString;
|
||||
@Setter
|
||||
@Entity
|
||||
@Table(name = "VENDOR_GROUP_REQ_FILE_TYPE")
|
||||
public class VendorGroupRequireFileType implements IdentityEntity, BasedEntity, Serializable, Voable<VendorGroupRequireFileTypeVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
public class VendorGroupRequireFileType implements IdentityEntity, BasedEntity, Voable<VendorGroupRequireFileTypeVo> {
|
||||
@Id
|
||||
@Column(name = "ID", nullable = false)
|
||||
@GeneratedValue(strategy = GenerationType.IDENTITY)
|
||||
|
||||
@@ -1,10 +1,6 @@
|
||||
package com.ecep.contract.model;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.Objects;
|
||||
|
||||
import com.ecep.contract.VendorType;
|
||||
import com.ecep.contract.util.HibernateProxyUtils;
|
||||
import com.ecep.contract.vo.VendorTypeLocalVo;
|
||||
|
||||
import jakarta.persistence.Entity;
|
||||
@@ -21,28 +17,7 @@ import lombok.ToString;
|
||||
@Entity
|
||||
@Table(name = "VENDOR_TYPE_LOCAL")
|
||||
@ToString(callSuper = true)
|
||||
public class VendorTypeLocal extends BaseEnumEntity<VendorType> implements Serializable, Voable<VendorTypeLocalVo> {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
@Override
|
||||
public final boolean equals(Object object) {
|
||||
if (this == object) {
|
||||
return true;
|
||||
}
|
||||
if (object == null) {
|
||||
return false;
|
||||
}
|
||||
if (HibernateProxyUtils.isNotEffectiveClassEquals(object, this)) {
|
||||
return false;
|
||||
}
|
||||
VendorTypeLocal that = (VendorTypeLocal) object;
|
||||
return getId() != null && Objects.equals(getId(), that.getId());
|
||||
}
|
||||
|
||||
@Override
|
||||
public final int hashCode() {
|
||||
return HibernateProxyUtils.hashCode(this);
|
||||
}
|
||||
public class VendorTypeLocal extends BaseEnumEntity<VendorType> implements Voable<VendorTypeLocalVo> {
|
||||
|
||||
@Override
|
||||
public VendorTypeLocalVo toVo() {
|
||||
|
||||
@@ -11,7 +11,6 @@ import java.io.Serializable;
|
||||
@Embeddable
|
||||
@Data
|
||||
public class VolumeSize implements Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 体积
|
||||
*/
|
||||
|
||||
@@ -1,12 +1,27 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 银行VO类
|
||||
*/
|
||||
@Data
|
||||
public class BankVo implements IdentityEntity {
|
||||
public class BankVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 银行ID
|
||||
*/
|
||||
private Integer id;
|
||||
/**
|
||||
* 银行编码
|
||||
*/
|
||||
private String code;
|
||||
/**
|
||||
* 银行名称
|
||||
*/
|
||||
private String name;
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -7,9 +8,12 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CloudBasedVo implements IdentityEntity {
|
||||
public class CloudBasedVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Integer id;
|
||||
|
||||
/**
|
||||
* 运行时异常
|
||||
*/
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import lombok.Data;
|
||||
@@ -7,7 +8,8 @@ import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CloudRkVo extends CloudBasedVo implements CompanyBasedVo {
|
||||
public class CloudRkVo extends CloudBasedVo implements CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private String cloudId;
|
||||
private Integer companyId;
|
||||
private boolean autoUpdate = false;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import lombok.Data;
|
||||
@@ -7,7 +8,8 @@ import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CloudTycVo extends CloudBasedVo implements CompanyBasedVo {
|
||||
public class CloudTycVo extends CloudBasedVo implements CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer score;
|
||||
private LocalDateTime cloudLatest;
|
||||
private String cloudId;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -8,7 +9,8 @@ import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CloudYuVo extends CloudBasedVo implements CompanyBasedVo {
|
||||
public class CloudYuVo extends CloudBasedVo implements CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer companyId;
|
||||
|
||||
private LocalDate vendorUpdateDate;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyBankAccountVo implements IdentityEntity, CompanyBasedVo {
|
||||
public class CompanyBankAccountVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* 公司id
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.BlackReasonType;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyBlackReasonVo implements IdentityEntity ,CompanyBasedVo{
|
||||
public class CompanyBlackReasonVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private BlackReasonType type;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyContactVo implements IdentityEntity, NamedEntity, CompanyBasedVo {
|
||||
public class CompanyContactVo implements IdentityEntity, NamedEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String name;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyContractVo implements IdentityEntity ,CompanyBasedVo{
|
||||
public class CompanyContractVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private Integer contractId;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyCustomerEntityVo implements IdentityEntity {
|
||||
public class CompanyCustomerEntityVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* 公司客户
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyCustomerEvaluationFormFileVo implements IdentityEntity {
|
||||
public class CompanyCustomerEvaluationFormFileVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer customerFile;
|
||||
private String catalog;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.ContractFileType;
|
||||
import com.ecep.contract.CustomerFileType;
|
||||
import com.ecep.contract.model.BaseEnumEntity;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -7,8 +8,22 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CompanyCustomerFileTypeLocalVo extends BaseEnumEntity<CustomerFileType> implements IdentityEntity {
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class CompanyCustomerFileTypeLocalVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* File type
|
||||
*/
|
||||
private CustomerFileType type;
|
||||
/**
|
||||
* Language
|
||||
*/
|
||||
private String lang;
|
||||
/**
|
||||
* Value
|
||||
*/
|
||||
private String value;
|
||||
}
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.CustomerFileType;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyCustomerFileVo implements IdentityEntity {
|
||||
public class CompanyCustomerFileVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer customer;
|
||||
private CustomerFileType type;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -8,7 +9,8 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyCustomerVo implements IdentityEntity, CompanyBasedVo {
|
||||
public class CompanyCustomerVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* 公司
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyExtendInfoVo implements IdentityEntity, CompanyBasedVo {
|
||||
public class CompanyExtendInfoVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private boolean disableVerify = false;
|
||||
|
||||
@@ -1,14 +1,30 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.CompanyFileType;
|
||||
import com.ecep.contract.ContractFileType;
|
||||
import com.ecep.contract.model.BaseEnumEntity;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CompanyFileTypeLocalVo extends BaseEnumEntity<CompanyFileType> implements IdentityEntity {
|
||||
public class CompanyFileTypeLocalVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* File type
|
||||
*/
|
||||
private CompanyFileType type;
|
||||
/**
|
||||
* Language
|
||||
*/
|
||||
private String lang;
|
||||
/**
|
||||
* Value
|
||||
*/
|
||||
private String value;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.ecep.contract.CompanyFileType;
|
||||
@@ -8,7 +9,8 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyFileVo implements IdentityEntity, CompanyBasedVo {
|
||||
public class CompanyFileVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyInvoiceInfoVo implements IdentityEntity, NamedEntity, CompanyBasedVo {
|
||||
public class CompanyInvoiceInfoVo implements IdentityEntity, NamedEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private Integer companyId;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -8,7 +9,8 @@ import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyOldNameVo implements IdentityEntity, NamedEntity, CompanyBasedVo {
|
||||
public class CompanyOldNameVo implements IdentityEntity, NamedEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String name;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyVo implements IdentityEntity, NamedEntity {
|
||||
public class CompanyVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String uniscid;
|
||||
|
||||
@@ -3,10 +3,16 @@ package com.ecep.contract.vo;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ContractBidVendorVo implements IdentityEntity, ContractBasedVo, CompanyBasedVo {
|
||||
public class ContractBidVendorVo implements IdentityEntity, ContractBasedVo, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer companyId;
|
||||
/**
|
||||
* 报价单文件id, ContractFile
|
||||
*/
|
||||
private Integer quotationSheetFileId;
|
||||
}
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractCatalogVo implements IdentityEntity, NamedEntity {
|
||||
public class ContractCatalogVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String code;
|
||||
private String name;
|
||||
|
||||
@@ -3,12 +3,28 @@ package com.ecep.contract.vo;
|
||||
import com.ecep.contract.model.BaseEnumEntity;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.ContractFileType;
|
||||
import jakarta.persistence.*;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class ContractFileTypeLocalVo extends BaseEnumEntity<ContractFileType> implements IdentityEntity {
|
||||
public class ContractFileTypeLocalVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* File type
|
||||
*/
|
||||
private ContractFileType type;
|
||||
/**
|
||||
* Language
|
||||
*/
|
||||
private String lang;
|
||||
/**
|
||||
* Value
|
||||
*/
|
||||
private String value;
|
||||
private String description;
|
||||
private String suggestFileName;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -7,7 +8,8 @@ import com.ecep.contract.ContractFileType;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractFileVo implements IdentityEntity, ContractBasedVo {
|
||||
public class ContractFileVo implements IdentityEntity, ContractBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private ContractFileType type;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractGroupVo implements IdentityEntity, NamedEntity {
|
||||
public class ContractGroupVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -8,7 +9,8 @@ import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractItemVo implements IdentityEntity, ContractBasedVo {
|
||||
public class ContractItemVo implements IdentityEntity, ContractBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer refId;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractKindVo implements IdentityEntity, NamedEntity {
|
||||
public class ContractKindVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
@@ -8,7 +9,8 @@ import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractPayPlanVo implements IdentityEntity, ContractBasedVo {
|
||||
public class ContractPayPlanVo implements IdentityEntity, ContractBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* 关联的合同对象, Contract
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractTypeVo implements IdentityEntity, NamedEntity {
|
||||
public class ContractTypeVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import com.ecep.contract.ContractPayWay;
|
||||
@@ -8,7 +9,8 @@ import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractVo implements IdentityEntity, NamedEntity, CompanyBasedVo, ProjectBasedVo {
|
||||
public class ContractVo implements IdentityEntity, NamedEntity, CompanyBasedVo, ProjectBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String guid;
|
||||
private String code;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CustomerCatalogVo implements IdentityEntity {
|
||||
public class CustomerCatalogVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.ContractFileType;
|
||||
import com.ecep.contract.CustomerFileType;
|
||||
import com.ecep.contract.model.BaseEnumEntity;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -7,11 +8,24 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class CustomerFileTypeLocalVo
|
||||
extends BaseEnumEntity<CustomerFileType>
|
||||
implements IdentityEntity {
|
||||
public class CustomerFileTypeLocalVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* File type
|
||||
*/
|
||||
private CustomerFileType type;
|
||||
/**
|
||||
* Language
|
||||
*/
|
||||
private String lang;
|
||||
/**
|
||||
* Value
|
||||
*/
|
||||
private String value;
|
||||
private Integer orderNum = 0;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -8,7 +9,8 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CustomerSatisfactionSurveyVo implements IdentityEntity, ProjectBasedVo {
|
||||
public class CustomerSatisfactionSurveyVo implements IdentityEntity, ProjectBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer project;
|
||||
private String code;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -8,7 +9,8 @@ import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DeliverySignMethodVo implements IdentityEntity, NamedEntity {
|
||||
public class DeliverySignMethodVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class DepartmentVo implements IdentityEntity {
|
||||
public class DepartmentVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class EmployeeAuthBindVo implements IdentityEntity {
|
||||
public class EmployeeAuthBindVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer employeeId;
|
||||
private String ip;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@Data
|
||||
public class EmployeeLoginHistoryVo implements IdentityEntity {
|
||||
public class EmployeeLoginHistoryVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer employeeId;
|
||||
private String ip;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -8,7 +9,8 @@ import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class EmployeeRoleVo implements IdentityEntity, NamedEntity {
|
||||
public class EmployeeRoleVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String code;
|
||||
private String name;
|
||||
|
||||
@@ -1,15 +1,18 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
/**
|
||||
*
|
||||
*
|
||||
*/
|
||||
@Data
|
||||
public class EmployeeVo implements IdentityEntity, NamedEntity {
|
||||
public class EmployeeVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String account;
|
||||
private String name;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@@ -7,7 +8,8 @@ import lombok.Data;
|
||||
* 扩展供应商信息VO类
|
||||
*/
|
||||
@Data
|
||||
public class ExtendVendorInfoVo implements IdentityEntity, ContractBasedVo {
|
||||
public class ExtendVendorInfoVo implements IdentityEntity, ContractBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer groupId;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class FunctionVo implements IdentityEntity {
|
||||
public class FunctionVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String key;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class InventoryCatalogVo implements IdentityEntity {
|
||||
public class InventoryCatalogVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -10,7 +11,8 @@ import com.ecep.contract.model.VolumeSize;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class InventoryVo implements IdentityEntity {
|
||||
public class InventoryVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
@@ -29,8 +31,8 @@ public class InventoryVo implements IdentityEntity {
|
||||
private String weightUnit;
|
||||
private String volumeUnit;
|
||||
private String sizeUnit;
|
||||
private VolumeSize volumeSize;
|
||||
private VolumeSize packagedVolumeSize;
|
||||
private VolumeSizeVo volumeSize;
|
||||
private VolumeSizeVo packagedVolumeSize;
|
||||
private Integer creatorId;
|
||||
private LocalDate createTime;
|
||||
private Integer updaterId;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class InvoiceVo implements IdentityEntity, CompanyBasedVo {
|
||||
public class InvoiceVo implements IdentityEntity, CompanyBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String code;
|
||||
|
||||
@@ -1,10 +1,12 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PermissionVo implements IdentityEntity {
|
||||
public class PermissionVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer functionId;
|
||||
private String name;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PriceVo implements IdentityEntity {
|
||||
public class PriceVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer inventoryId;
|
||||
private Integer customerId;
|
||||
|
||||
@@ -5,8 +5,11 @@ import com.ecep.contract.model.NamedEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ProductTypeVo implements IdentityEntity, NamedEntity {
|
||||
public class ProductTypeVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -5,8 +5,12 @@ import com.ecep.contract.model.NamedEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ProductUsageVo implements IdentityEntity, NamedEntity {
|
||||
public class ProductUsageVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectBidVo implements IdentityEntity, ProjectBasedVo {
|
||||
public class ProjectBidVo implements IdentityEntity, ProjectBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer project;
|
||||
private int level;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectCostItemVo implements IdentityEntity {
|
||||
public class ProjectCostItemVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer costId;
|
||||
private String title;
|
||||
|
||||
@@ -1,15 +1,19 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
import lombok.Setter;
|
||||
|
||||
@Data
|
||||
public class ProjectCostVo implements IdentityEntity, ProjectBasedVo {
|
||||
public class ProjectCostVo implements IdentityEntity, ProjectBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer project;
|
||||
private int version;
|
||||
|
||||
private boolean standardPayWay = false;
|
||||
private String noStandardPayWayText;
|
||||
private boolean standardContractText = false;
|
||||
@@ -38,4 +42,7 @@ public class ProjectCostVo implements IdentityEntity, ProjectBasedVo {
|
||||
private String authorizationFile;
|
||||
private String description;
|
||||
private boolean importLock = false;
|
||||
|
||||
private int version;
|
||||
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.CustomerFileType;
|
||||
import com.ecep.contract.ProjectFileType;
|
||||
import com.ecep.contract.model.BaseEnumEntity;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
@@ -7,8 +8,23 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
@EqualsAndHashCode(callSuper = true)
|
||||
public class ProjectFileTypeLocalVo extends BaseEnumEntity<ProjectFileType> implements IdentityEntity {
|
||||
public class ProjectFileTypeLocalVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
/**
|
||||
* File type
|
||||
*/
|
||||
private ProjectFileType type;
|
||||
/**
|
||||
* Language
|
||||
*/
|
||||
private String lang;
|
||||
/**
|
||||
* Value
|
||||
*/
|
||||
private String value;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.ProjectFileType;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectFileVo implements IdentityEntity {
|
||||
public class ProjectFileVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer projectId;
|
||||
private ProjectFileType type;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
@@ -9,7 +10,8 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectFundPlanVo implements IdentityEntity {
|
||||
public class ProjectFundPlanVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer projectId;
|
||||
private LocalDate payDate;
|
||||
|
||||
@@ -4,8 +4,11 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ProjectIndustryVo implements IdentityEntity, NamedEntity {
|
||||
public class ProjectIndustryVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,31 +1,72 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 项目报价视图对象
|
||||
*/
|
||||
@Data
|
||||
public class ProjectQuotationVo implements IdentityEntity, ProjectBasedVo {
|
||||
public class ProjectQuotationVo implements IdentityEntity, ProjectBasedVo, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
/**
|
||||
* 主键ID
|
||||
*/
|
||||
private Integer id;
|
||||
/**
|
||||
* 项目ID
|
||||
*/
|
||||
private Integer project;
|
||||
/**
|
||||
* 报价等级
|
||||
*/
|
||||
private int level;
|
||||
/**
|
||||
* 是否标准支付方式
|
||||
*/
|
||||
private boolean standardPayWay = false;
|
||||
/**
|
||||
* 非标准支付方式描述
|
||||
*/
|
||||
private String noStandardPayWayText;
|
||||
/**
|
||||
* 报价金额
|
||||
*/
|
||||
private double amount;
|
||||
/**
|
||||
* 申请人ID
|
||||
*/
|
||||
private Integer applicantId;
|
||||
/**
|
||||
* 申请时间
|
||||
*/
|
||||
private LocalDateTime applyTime;
|
||||
/**
|
||||
* 审核人ID
|
||||
*/
|
||||
private Integer authorizerId;
|
||||
/**
|
||||
* 审核时间
|
||||
*/
|
||||
private LocalDateTime authorizationTime;
|
||||
/**
|
||||
* 审核文件
|
||||
*/
|
||||
private String authorizationFile;
|
||||
/**
|
||||
* 描述
|
||||
*/
|
||||
private String description;
|
||||
/**
|
||||
* 评价表单文件, CompanyCustomerEvaluationFormFile
|
||||
*/
|
||||
private Integer evaluationFileId;
|
||||
/**
|
||||
* 是否激活
|
||||
*/
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -5,8 +5,11 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ProjectSaleTypeRequireFileTypeVo implements IdentityEntity {
|
||||
public class ProjectSaleTypeRequireFileTypeVo implements IdentityEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private Integer saleTypeId;
|
||||
private String frequency;
|
||||
|
||||
@@ -2,11 +2,14 @@ package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.time.LocalDate;
|
||||
|
||||
@Data
|
||||
public class ProjectSaleTypeVo implements IdentityEntity, NamedEntity {
|
||||
public class ProjectSaleTypeVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
@@ -16,7 +19,7 @@ public class ProjectSaleTypeVo implements IdentityEntity, NamedEntity {
|
||||
private Double criticalProjectLimit;
|
||||
private boolean active = false;
|
||||
private String description;
|
||||
|
||||
|
||||
private LocalDate created;
|
||||
private int version;
|
||||
}
|
||||
@@ -4,8 +4,11 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
|
||||
@Data
|
||||
public class ProjectTypeVo implements IdentityEntity, NamedEntity {
|
||||
public class ProjectTypeVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.io.Serializable;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectVo implements IdentityEntity, NamedEntity {
|
||||
public class ProjectVo implements IdentityEntity, NamedEntity, Serializable {
|
||||
private static final long serialVersionUID = 1L;
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user