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

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

Browse Source 
重构所有VO对象，统一字段命名规范，移除冗余字段，优化接口实现
新增Voable接口用于VO对象转换
调整BaseViewModel和ProjectBasedViewModel接口定义
更新相关服务和控制器以适应VO对象变更
This commit is contained in:
宋其青
2025-09-21 17:47:52 +08:00
parent 07c3f39a95
commit 039d753bab
408 changed files with 6602 additions and 4800 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
common/src/main/java/com/ecep/contract/model/Bank.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.BankVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -18,7 +19,7 @@ import lombok.Setter;
@Setter
@Entity
@Table(name = "BANK", schema = "supplier_ms")
public class Bank implements BasedEntity, IdentityEntity, Serializable {
public class Bank implements BasedEntity, IdentityEntity, Serializable, Voable<BankVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -50,4 +51,13 @@ public class Bank implements BasedEntity, IdentityEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public BankVo toVo() {
BankVo vo = new BankVo();
vo.setId(id);
vo.setCode(code);
vo.setName(name);
return vo;
}
}

2
common/src/main/java/com/ecep/contract/model/BaseEnumEntity.java
View File

@@ -34,4 +34,6 @@ public abstract class BaseEnumEntity<T extends Enum<?>> implements IdentityEntit
@Column(name = "VALUE")
private String value;
}

24
common/src/main/java/com/ecep/contract/model/CloudTyc.java
View File

@@ -2,11 +2,13 @@ package com.ecep.contract.model;
import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDateTime;
import java.util.Objects;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CloudTycVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -26,7 +28,7 @@ import lombok.ToString;
@Setter
@Entity
@Table(name = "CLOUD_TYC", schema = "supplier_ms")
public class CloudTyc implements IdentityEntity, Serializable {
public class CloudTyc implements IdentityEntity, Serializable, Voable<CloudTycVo> {
private static final long serialVersionUID = 1L;
/**
* 主键
@@ -44,7 +46,7 @@ public class CloudTyc implements IdentityEntity, Serializable {
private Integer score;
@Column(name = "CLOUD_LATEST")
private Instant cloudLatest;
private LocalDateTime cloudLatest;
/**
* 平台编号
@@ -56,7 +58,7 @@ public class CloudTyc implements IdentityEntity, Serializable {
* 本地更新时间戳，控制更新频率和重复更新
*/
@Column(name = "LATEST_UPDATE")
private Instant latestUpdate;
private LocalDateTime latestUpdate;
/**
* 关联的公司
@@ -89,4 +91,20 @@ public class CloudTyc implements IdentityEntity, Serializable {
return HibernateProxyUtils.hashCode(this);
}
@Override
public CloudTycVo toVo() {
CloudTycVo vo = new CloudTycVo();
vo.setId(id);
vo.setScore(score);
vo.setCloudLatest(cloudLatest);
vo.setCloudId(cloudId);
vo.setLatestUpdate(latestUpdate);
if (company != null) {
vo.setCompanyId(company.getId());
}
vo.setVersion(version);
// active字段默认为false，在CloudTycVo类中已经设置
return vo;
}
}

25
common/src/main/java/com/ecep/contract/model/CloudYu.java
View File

@@ -1,13 +1,14 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Objects;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CloudYuVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,7 @@ import lombok.ToString;
@Entity
@Table(name = "CLOUD_YU", schema = "supplier_ms")
@ToString
public class CloudYu implements IdentityEntity, Serializable {
public class CloudYu implements IdentityEntity, Serializable, Voable<CloudYuVo> {
private static final long serialVersionUID = 1L;
/**
* 主键
@@ -41,7 +42,7 @@ public class CloudYu implements IdentityEntity, Serializable {
* 本地更新时间戳，控制更新频率和重复更新
*/
@Column(name = "LATEST_UPDATE")
private Instant latestUpdate;
private LocalDateTime latestUpdate;
/**
* 关联的公司
@@ -71,7 +72,7 @@ public class CloudYu implements IdentityEntity, Serializable {
* 数据更新日期
*/
@Column(name = "CLOUD_LATEST")
private Instant cloudLatest;
private LocalDateTime cloudLatest;
@Override
public final boolean equals(Object object) {
@@ -90,4 +91,20 @@ public class CloudYu implements IdentityEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public CloudYuVo toVo() {
CloudYuVo vo = new CloudYuVo();
vo.setId(id);
vo.setLatestUpdate(latestUpdate);
if (company != null) {
vo.setCompanyId(company.getId());
}
vo.setExceptionMessage(exceptionMessage);
vo.setVendorUpdateDate(vendorUpdateDate);
vo.setCustomerUpdateDate(customerUpdateDate);
vo.setCloudLatest(cloudLatest);
// active字段默认为false，在CloudYuVo类中已经设置
return vo;
}
}

31
common/src/main/java/com/ecep/contract/model/Company.java
View File

@@ -7,6 +7,7 @@ import java.util.Objects;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY")
@ToString
public class Company implements IdentityEntity, NamedEntity, BasedEntity, Serializable {
public class Company implements IdentityEntity, NamedEntity, BasedEntity, Serializable, Voable<CompanyVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -197,4 +198,32 @@ public class Company implements IdentityEntity, NamedEntity, BasedEntity, Serial
return HibernateProxyUtils.hashCode(this);
}
@Override
public CompanyVo toVo() {
CompanyVo vo = new CompanyVo();
vo.setId(id);
vo.setName(name);
vo.setUniscid(getUniscid());
vo.setShortName(getShortName());
vo.setPathExist(getPathExist());
vo.setPath(getPath());
vo.setCreated(getCreated());
vo.setEntStatus(getEntStatus());
vo.setEntType(getEntType());
vo.setDistrict(getDistrict());
vo.setIndustry(getIndustry());
vo.setTelephone(getTelephone());
vo.setRegAddr(getRegAddr());
vo.setAddress(getAddress());
vo.setSetupDate(getSetupDate());
vo.setOperationPeriodBegin(getOperationPeriodBegin());
vo.setOperationPeriodEnd(getOperationPeriodEnd());
vo.setRegisteredCapital(registeredCapital);
vo.setRegisteredCapitalCurrency(registeredCapitalCurrency);
vo.setLegalRepresentative(legalRepresentative);
vo.setMemo(memo);
vo.setRemark(memo);
vo.setVersion(version);
return vo;
}
}

21
common/src/main/java/com/ecep/contract/model/CompanyContact.java
View File

@@ -7,6 +7,7 @@ import java.util.Objects;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyContactVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -30,7 +31,7 @@ import lombok.ToString;
@Index(name = "CUSTOMER_ID", columnList = "COMPANY_ID")
})
@ToString
public class CompanyContact implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable {
public class CompanyContact implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable, Voable<CompanyContactVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -97,4 +98,22 @@ public class CompanyContact implements IdentityEntity, NamedEntity, BasedEntity,
return HibernateProxyUtils.hashCode(this);
}
@Override
public CompanyContactVo toVo() {
CompanyContactVo vo = new CompanyContactVo();
vo.setId(id);
if (company != null) {
vo.setCompanyId(company.getId());
}
vo.setName(name);
vo.setPosition(position);
vo.setPhone(phone);
vo.setEmail(email);
vo.setAddress(address);
vo.setU8Code(u8Code);
vo.setMemo(memo);
vo.setCreated(created);
// primary和active字段默认为false，在CompanyContactVo类中已经设置
return vo;
}
}

3
common/src/main/java/com/ecep/contract/model/CompanyCustomer.java
View File

@@ -3,6 +3,7 @@ package com.ecep.contract.model;
import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.Objects;
import org.hibernate.annotations.ColumnDefault;
@@ -69,7 +70,7 @@ public class CompanyCustomer implements IdentityEntity, CompanyBasedEntity, Seri
* 记录创建日期
*/
@Column(name = "CREATED")
private Instant created;
private LocalDateTime created;
@Version
@ColumnDefault("0")

29
common/src/main/java/com/ecep/contract/model/CompanyCustomerEntity.java
View File

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyCustomerEntityVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,7 @@ import lombok.ToString;
})
@ToString
public class CompanyCustomerEntity implements IdentityEntity, Serializable {
public class CompanyCustomerEntity implements IdentityEntity, Serializable, Voable<CompanyCustomerEntityVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -113,4 +114,30 @@ public class CompanyCustomerEntity implements IdentityEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public CompanyCustomerEntityVo toVo() {
CompanyCustomerEntityVo vo = new CompanyCustomerEntityVo();
vo.setId(id);
if (customer != null) {
vo.setCustomerId(customer.getId());
}
vo.setName(name);
vo.setAbbName(abbName);
vo.setCode(code);
if (catalog != null) {
vo.setCustomerCatalogId(catalog.getId());
}
if (creator != null) {
vo.setCreatorId(creator.getId());
}
if (modifier != null) {
vo.setModifierId(modifier.getId());
}
vo.setModifyDate(modifyDate);
vo.setDevelopDate(developDate);
vo.setUpdatedDate(updatedDate);
vo.setFetchedTime(fetchedTime);
return vo;
}
}

18
common/src/main/java/com/ecep/contract/model/CompanyFile.java
View File

@@ -6,6 +6,7 @@ import java.util.Objects;
import com.ecep.contract.CompanyFileType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyFileVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -30,7 +31,7 @@ import lombok.ToString;
@Entity
@Table(name = "COMPANY_FILE")
@ToString
public class CompanyFile implements IdentityEntity, CompanyBasedEntity, Serializable {
public class CompanyFile implements IdentityEntity, CompanyBasedEntity, Serializable, Voable<CompanyFileVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -81,4 +82,19 @@ public class CompanyFile implements IdentityEntity, CompanyBasedEntity, Serializ
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public CompanyFileVo toVo() {
CompanyFileVo vo = new CompanyFileVo();
vo.setId(id);
if (company != null) {
vo.setCompanyId(company.getId());
}
vo.setType(type);
vo.setApplyDate(applyDate);
vo.setExpiringDate(expiringDate);
vo.setFilePath(filePath);
vo.setActive(false); // 实体类中没有active字段，设置默认值false
return vo;
}
}

38
common/src/main/java/com/ecep/contract/model/CompanyVendor.java
View File

@@ -1,17 +1,17 @@
package com.ecep.contract.model;
import java.io.Serializable;
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.List;
import java.util.Objects;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.VendorType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorVo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -32,11 +32,9 @@ import lombok.ToString;
@Getter
@Setter
@Entity
@Table(name = "COMPANY_VENDOR", schema = "supplier_ms", indexes = {
})
@Table(name = "COMPANY_VENDOR", schema = "supplier_ms")
@ToString
public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serializable {
public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serializable, Voable<CompanyVendorVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -100,7 +98,7 @@ public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serial
* 记录创建日期
*/
@Column(name = "CREATED")
private Instant created;
private LocalDateTime created;
@Version
@ColumnDefault("0")
@@ -124,4 +122,28 @@ public class CompanyVendor implements IdentityEntity, CompanyBasedEntity, Serial
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public CompanyVendorVo toVo() {
CompanyVendorVo vo = new CompanyVendorVo();
vo.setId(id);
vo.setType(type);
vo.setProtocolProvider(protocolProvider);
if (company != null) {
vo.setCompanyId(company.getId());
}
if (catalog != null) {
vo.setCatalogId(catalog.getId());
}
vo.setDevelopDate(developDate);
vo.setPath(path);
if (contact != null) {
vo.setContactId(contact.getId());
}
vo.setPurchase(purchase);
vo.setDescription(description);
vo.setCreated(created);
vo.setVersion(version);
return vo;
}
}

29
common/src/main/java/com/ecep/contract/model/CompanyVendorEntity.java
View File

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.CompanyVendorEntityVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -30,7 +31,7 @@ import lombok.ToString;
})
@ToString
public class CompanyVendorEntity implements IdentityEntity, Serializable {
public class CompanyVendorEntity implements IdentityEntity, Serializable, Voable<CompanyVendorEntityVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -109,4 +110,30 @@ public class CompanyVendorEntity implements IdentityEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public CompanyVendorEntityVo toVo() {
CompanyVendorEntityVo vo = new CompanyVendorEntityVo();
vo.setId(id);
if (vendor != null) {
vo.setVendorId(vendor.getId());
}
vo.setName(name);
vo.setAbbName(abbName);
vo.setCode(code);
if (catalog != null) {
vo.setCatalogId(catalog.getId());
}
if (creator != null) {
vo.setCreatorId(creator.getId());
}
if (modifier != null) {
vo.setModifierId(modifier.getId());
}
vo.setModifyDate(modifyDate);
vo.setDevelopDate(developDate);
vo.setUpdatedDate(updatedDate);
vo.setFetchedTime(fetchedTime);
return vo;
}
}

66
common/src/main/java/com/ecep/contract/model/Contract.java
View File

@@ -9,6 +9,7 @@ import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.ContractPayWay;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -35,7 +36,8 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT", schema = "supplier_ms")
@ToString
public class Contract implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable {
public class Contract
implements IdentityEntity, NamedEntity, BasedEntity, CompanyBasedEntity, Serializable, Voable<ContractVo> {
private static final long serialVersionUID = 1L;
/**
* 主键
@@ -304,4 +306,66 @@ public class Contract implements IdentityEntity, NamedEntity, BasedEntity, Compa
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractVo toVo() {
ContractVo vo = new ContractVo();
vo.setId(id);
vo.setGuid(getGuid());
vo.setCode(getCode());
vo.setName(name);
if (getCompany() != null) {
vo.setCompanyId(getCompany().getId());
}
if (group != null) {
vo.setGroupId(group.getId());
}
if (type != null) {
vo.setTypeId(type.getId());
}
if (kind != null) {
vo.setKindId(kind.getId());
}
if (project != null) {
vo.setProject(project.getId());
}
vo.setParentCode(getParentCode());
vo.setOrderDate(getOrderDate());
vo.setStartDate(getStartDate());
vo.setEndDate(getEndDate());
if (setupPerson != null) {
vo.setSetupPersonId(setupPerson.getId());
}
vo.setSetupDate(getSetupDate());
if (inurePerson != null) {
vo.setInurePersonId(inurePerson.getId());
}
vo.setInureDate(getInureDate());
if (varyPerson != null) {
vo.setVaryPersonId(varyPerson.getId());
}
vo.setVaryDate(getVaryDate());
if (employee != null) {
vo.setEmployeeId(employee.getId());
}
if (handler != null) {
vo.setHandlerId(handler.getId());
}
vo.setState(getState());
vo.setPath(getPath());
vo.setDescription(getDescription());
vo.setCreated(getCreated());
vo.setAmount(getAmount());
vo.setStandardPayWay(isStandardPayWay());
vo.setStandardPContractText(isStandardPContractText());
vo.setTotalQuantity(getTotalQuantity());
vo.setTotalAmount(getTotalAmount());
vo.setTotalUnTaxAmount(getTotalUnTaxAmount());
vo.setExecQuantity(getExecQuantity());
vo.setExecAmount(getExecAmount());
vo.setExecUnTaxAmount(getExecUnTaxAmount());
vo.setPayWay(getPayWay());
vo.setVersion(getVersion());
return vo;
}
}

15
common/src/main/java/com/ecep/contract/model/ContractCatalog.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractCatalogVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -23,7 +24,7 @@ import lombok.Setter;
@Setter
@Entity
@Table(name = "CONTRACT_CATALOG", schema = "supplier_ms")
public class ContractCatalog implements IdentityEntity, NamedEntity, Serializable {
public class ContractCatalog implements IdentityEntity, NamedEntity, Serializable, Voable<ContractCatalogVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -68,4 +69,16 @@ public class ContractCatalog implements IdentityEntity, NamedEntity, Serializabl
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractCatalogVo toVo() {
ContractCatalogVo vo = new ContractCatalogVo();
vo.setId(id);
vo.setCode(code);
vo.setName(name);
vo.setPath(path);
vo.setParent(parent);
vo.setUseYear(useYear);
return vo;
}
}

17
common/src/main/java/com/ecep/contract/model/ContractFileTypeLocal.java
View File

@@ -5,6 +5,7 @@ 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;
import jakarta.persistence.Entity;
@@ -21,7 +22,7 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_FILE_TYPE_LOCAL")
@ToString
public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> implements Serializable {
public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> implements Serializable, Voable<ContractFileTypeLocalVo> {
private static final long serialVersionUID = 1L;
/**
* 建议的文件名
@@ -29,6 +30,9 @@ public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> impl
@Column(name = "SUGGEST_FILE_NAME")
private String suggestFileName;
@Column(name = "DESCRIPTION")
private String description;
@Override
public final boolean equals(Object object) {
if (this == object)
@@ -46,4 +50,15 @@ public class ContractFileTypeLocal extends BaseEnumEntity<ContractFileType> impl
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractFileTypeLocalVo toVo() {
ContractFileTypeLocalVo vo = new ContractFileTypeLocalVo();
vo.setId(getId());
vo.setLanguage(getLang());
vo.setType(getType());
vo.setDescription(getDescription());
vo.setSuggestFileName(suggestFileName);
return vo;
}
}

15
common/src/main/java/com/ecep/contract/model/ContractGroup.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractGroupVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -21,7 +22,7 @@ import lombok.Setter;
@Setter
@Entity
@Table(name = "CONTRACT_GROUP", schema = "supplier_ms")
public class ContractGroup implements IdentityEntity, NamedEntity, Serializable {
public class ContractGroup implements IdentityEntity, NamedEntity, Serializable, Voable<ContractGroupVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -67,4 +68,16 @@ public class ContractGroup implements IdentityEntity, NamedEntity, Serializable
super.hashCode();
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractGroupVo toVo() {
ContractGroupVo vo = new ContractGroupVo();
vo.setId(id);
vo.setName(name);
vo.setCode(code);
vo.setTitle(title);
// 注意：ContractGroup实体类中似乎没有parentId、order、description和active字段，但ContractGroupVo中有这些字段
// 由于实体类中没有这些字段，所以无法设置它们的值
return vo;
}
}

37
common/src/main/java/com/ecep/contract/model/ContractItem.java
View File

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractItemVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -28,7 +29,8 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_ITEM")
@ToString
public class ContractItem implements IdentityEntity, ContractBasedEntity, BasedEntity, Serializable {
public class ContractItem
implements IdentityEntity, ContractBasedEntity, BasedEntity, Serializable, Voable<ContractItemVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -162,4 +164,37 @@ public class ContractItem implements IdentityEntity, ContractBasedEntity, BasedE
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractItemVo toVo() {
ContractItemVo vo = new ContractItemVo();
vo.setId(id);
if (contract != null) {
vo.setContractId(contract.getId());
}
vo.setRefId(refId);
vo.setItemCode(itemCode);
vo.setTitle(title);
vo.setSpecification(specification);
vo.setUnit(unit);
if (inventory != null) {
vo.setInventoryId(inventory.getId());
}
vo.setExclusiveTaxPrice(exclusiveTaxPrice);
vo.setTaxRate(taxRate);
vo.setTaxPrice(taxPrice);
vo.setQuantity(quantity);
vo.setCreateDate(createDate);
vo.setUpdateDate(updateDate);
vo.setStartDate(startDate);
vo.setEndDate(endDate);
if (creator != null) {
vo.setCreatorId(creator.getId());
}
if (updater != null) {
vo.setUpdaterId(updater.getId());
}
vo.setRemark(remark);
return vo;
}
}

15
common/src/main/java/com/ecep/contract/model/ContractKind.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractKindVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -23,7 +24,7 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_KIND", schema = "supplier_ms")
@ToString
public class ContractKind implements IdentityEntity, NamedEntity, Serializable {
public class ContractKind implements IdentityEntity, NamedEntity, Serializable, Voable<ContractKindVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -67,4 +68,16 @@ public class ContractKind implements IdentityEntity, NamedEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractKindVo toVo() {
ContractKindVo vo = new ContractKindVo();
vo.setId(id);
vo.setName(name);
vo.setCode(code);
vo.setTitle(title);
// 注意：ContractKind实体类中似乎没有active字段，但ContractKindVo中有这些字段
// 由于实体类中没有这些字段，所以无法设置它们的值
return vo;
}
}

18
common/src/main/java/com/ecep/contract/model/ContractPayPlan.java
View File

@@ -6,6 +6,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractPayPlanVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,7 @@ import lombok.Setter;
@Entity
@Table(name = "CONTRACT_PAY_PLAN", schema = "supplier_ms", indexes = {
})
public class ContractPayPlan implements IdentityEntity, ContractBasedEntity, Serializable {
public class ContractPayPlan implements IdentityEntity, ContractBasedEntity, Serializable, Voable<ContractPayPlanVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -86,4 +87,19 @@ public class ContractPayPlan implements IdentityEntity, ContractBasedEntity, Ser
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractPayPlanVo toVo() {
ContractPayPlanVo vo = new ContractPayPlanVo();
vo.setId(id);
if (contract != null) {
vo.setContractId(contract.getId());
}
vo.setRefId(refId);
vo.setPayCurrency(payCurrency);
vo.setPayDate(payDate);
vo.setUpdateDate(updateDate);
vo.setPayTerm(payTerm);
return vo;
}
}

17
common/src/main/java/com/ecep/contract/model/ContractType.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ContractTypeVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -23,7 +24,7 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_TYPE", schema = "supplier_ms")
@ToString
public class ContractType implements IdentityEntity, NamedEntity, Serializable {
public class ContractType implements IdentityEntity, NamedEntity, Serializable, Voable<ContractTypeVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -74,4 +75,18 @@ public class ContractType implements IdentityEntity, NamedEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ContractTypeVo toVo() {
ContractTypeVo vo = new ContractTypeVo();
vo.setId(id);
vo.setName(name);
vo.setCode(code);
vo.setCatalog(catalog);
vo.setTitle(title);
vo.setDirection(direction);
// 注意：ContractType实体类中似乎没有active字段，但ContractTypeVo中有这些字段
// 由于实体类中没有这些字段，所以无法设置它们的值
return vo;
}
}

16
common/src/main/java/com/ecep/contract/model/Department.java
View File

@@ -4,6 +4,7 @@ import java.io.Serializable;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.DepartmentVo;
import jakarta.persistence.Column;
import jakarta.persistence.FetchType;
@@ -21,7 +22,7 @@ import lombok.ToString;
@Setter
@jakarta.persistence.Entity
@Table(name = "DEPARTMENT", schema = "supplier_ms")
public class Department implements BasedEntity, IdentityEntity, Serializable {
public class Department implements BasedEntity, IdentityEntity, Serializable, Voable<DepartmentVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -61,4 +62,17 @@ public class Department implements BasedEntity, IdentityEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public DepartmentVo toVo() {
DepartmentVo vo = new DepartmentVo();
vo.setId(id);
vo.setName(name);
vo.setCode(code);
if (getLeader() != null) {
vo.setLeaderId(getLeader().getId());
}
vo.setActive(isActive);
return vo;
}
}

30
common/src/main/java/com/ecep/contract/model/Employee.java
View File

@@ -5,6 +5,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.EmployeeVo;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@@ -27,7 +28,7 @@ import lombok.ToString;
@Setter
@jakarta.persistence.Entity
@Table(name = "EMPLOYEE", schema = "supplier_ms")
public class Employee implements BasedEntity, IdentityEntity, NamedEntity, Serializable {
public class Employee implements BasedEntity, IdentityEntity, NamedEntity, Serializable, Voable<EmployeeVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -130,4 +131,31 @@ public class Employee implements BasedEntity, IdentityEntity, NamedEntity, Seria
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public EmployeeVo toVo() {
EmployeeVo vo = new EmployeeVo();
vo.setId(id);
vo.setAccount(account);
vo.setName(name);
vo.setAlias(alias);
vo.setCode(code);
if (getDepartment() != null) {
vo.setDepartmentId(getDepartment().getId());
}
vo.setPhone(phone);
vo.setEmail(email);
vo.setCreated(created);
vo.setEntryDate(entryDate);
vo.setLeaveDate(leaveDate);
vo.setLocale(locale);
vo.setDateFormatter(dateFormatter);
vo.setDateTimeFormatter(dateTimeFormatter);
vo.setTimeFormatter(timeFormatter);
vo.setTimeZone(timeZone);
vo.setNumberFormatter(numberFormatter);
vo.setCurrencyFormatter(currencyFormatter);
vo.setActive(isActive());
return vo;
}
}

17
common/src/main/java/com/ecep/contract/model/EmployeeAuthBind.java
View File

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.EmployeeAuthBindVo;
import jakarta.persistence.Column;
import jakarta.persistence.FetchType;
@@ -22,7 +23,7 @@ import lombok.ToString;
@Setter
@jakarta.persistence.Entity
@Table(name = "EMPLOYEE_AUTH_BIND", schema = "supplier_ms")
public class EmployeeAuthBind implements BasedEntity, IdentityEntity, Serializable {
public class EmployeeAuthBind implements BasedEntity, IdentityEntity, Serializable, Voable<EmployeeAuthBindVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -80,4 +81,18 @@ public class EmployeeAuthBind implements BasedEntity, IdentityEntity, Serializab
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public EmployeeAuthBindVo toVo() {
EmployeeAuthBindVo vo = new EmployeeAuthBindVo();
vo.setId(id);
vo.setEmployeeId(employee != null ? employee.getId() : null);
vo.setIp(ip);
vo.setMac(mac);
vo.setCreateTime(createTime);
vo.setUpdaterId(updater != null ? updater.getId() : null);
vo.setUpdateTime(updateTime);
vo.setDescription(description);
return vo;
}
}

15
common/src/main/java/com/ecep/contract/model/EmployeeLoginHistory.java
View File

@@ -5,6 +5,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.EmployeeLoginHistoryVo;
import jakarta.persistence.Column;
import jakarta.persistence.FetchType;
@@ -21,7 +22,7 @@ import lombok.Setter;
@Setter
@jakarta.persistence.Entity
@Table(name = "EMPLOYEE_LOGIN_HISTORY", schema = "supplier_ms")
public class EmployeeLoginHistory implements BasedEntity, IdentityEntity, Serializable {
public class EmployeeLoginHistory implements BasedEntity, IdentityEntity, Serializable, Voable<EmployeeLoginHistoryVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -67,4 +68,16 @@ public class EmployeeLoginHistory implements BasedEntity, IdentityEntity, Serial
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public EmployeeLoginHistoryVo toVo() {
EmployeeLoginHistoryVo vo = new EmployeeLoginHistoryVo();
vo.setId(id);
vo.setEmployeeId(employee != null ? employee.getId() : null);
vo.setIp(ip);
vo.setMac(mac);
vo.setLoginTime(loginTime);
vo.setActiveTime(activeTime);
return vo;
}
}

4
common/src/main/java/com/ecep/contract/model/Inventory.java
View File

@@ -143,9 +143,11 @@ public class Inventory implements IdentityEntity, BasedEntity, Serializable {
@ToString.Exclude
private Employee creator;
/**
* 创建时间
*/
@Column(name = "CREATE_DATE")
private LocalDate createTime;
/**
* 更新人
*/

22
common/src/main/java/com/ecep/contract/model/InventoryHistoryPrice.java
View File

@@ -5,6 +5,7 @@ import java.time.Year;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.InventoryHistoryPriceVo;
import jakarta.persistence.AttributeOverride;
import jakarta.persistence.AttributeOverrides;
@@ -27,7 +28,7 @@ import lombok.ToString;
@ToString
@Entity
@Table(name = "INVENTORY_HISTORY", schema = "supplier_ms")
public class InventoryHistoryPrice implements IdentityEntity, Serializable {
public class InventoryHistoryPrice implements IdentityEntity, Serializable, Voable<InventoryHistoryPriceVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -121,4 +122,23 @@ public class InventoryHistoryPrice implements IdentityEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public InventoryHistoryPriceVo toVo() {
InventoryHistoryPriceVo vo = new InventoryHistoryPriceVo();
vo.setId(getId());
if (getInventory() != null) {
vo.setInventoryId(getInventory().getId());
}
vo.setYear(getYear());
vo.setLatestPurchasePrice((getLatestPurchasePrice()));
vo.setLatestSalePrice((getLatestSalePrice()));
vo.setMiniPurchasePrice((getMiniPurchasePrice()));
vo.setMiniSalePrice((getMiniSalePrice()));
vo.setMaxPurchasePrice((getMaxPurchasePrice()));
vo.setMaxSalePrice((getMaxSalePrice()));
return vo;
}
}

16
common/src/main/java/com/ecep/contract/model/Invoice.java
View File

@@ -7,6 +7,7 @@ import java.util.Objects;
import org.springframework.util.StringUtils;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.InvoiceVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -29,7 +30,7 @@ import lombok.ToString;
@Entity
@Table(name = "INVOICE", schema = "supplier_ms")
@ToString
public class Invoice implements IdentityEntity, BasedEntity, Serializable {
public class Invoice implements IdentityEntity, BasedEntity, Serializable, Voable<InvoiceVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -88,4 +89,17 @@ public class Invoice implements IdentityEntity, BasedEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public InvoiceVo toVo() {
InvoiceVo vo = new InvoiceVo();
vo.setId(id);
if (company != null) {
vo.setCompanyId(company.getId());
}
vo.setCode(code);
vo.setInvoiceDate(invoiceDate);
vo.setDescription(description);
return vo;
}
}

64
common/src/main/java/com/ecep/contract/model/Project.java
View File

@@ -7,6 +7,7 @@ import java.util.Objects;
import org.hibernate.annotations.ColumnDefault;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ProjectVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -30,7 +31,7 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT", schema = "supplier_ms")
@ToString
public class Project implements IdentityEntity, NamedEntity, BasedEntity, Serializable {
public class Project implements IdentityEntity, NamedEntity, BasedEntity, Serializable, Voable<ProjectVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -247,4 +248,65 @@ public class Project implements IdentityEntity, NamedEntity, BasedEntity, Serial
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ProjectVo toVo() {
ProjectVo vo = new ProjectVo();
vo.setId(id);
vo.setName(name);
vo.setCode(code);
if (getCustomer() != null) {
vo.setCustomerId(getCustomer().getId());
}
if (getProjectType() != null) {
vo.setProjectTypeId(getProjectType().getId());
}
if (getIndustry() != null) {
vo.setIndustryId(getIndustry().getId());
}
if (getSaleType() != null) {
vo.setSaleTypeId(getSaleType().getId());
}
if (getProductType() != null) {
vo.setProductTypeId(getProductType().getId());
}
if (getDeliverySignMethod() != null) {
vo.setDeliverySignMethodId(getDeliverySignMethod().getId());
}
if (getProductUsage() != null) {
vo.setProductUsageId(getProductUsage().getId());
}
vo.setCodeYear(getCodeYear());
vo.setCodeSequenceNumber(getCodeSequenceNumber());
if (getApplicant() != null) {
vo.setApplicantId(getApplicant().getId());
}
if (getAuthorizer() != null) {
vo.setAuthorizerId(getAuthorizer().getId());
}
if (getBankAccount() != null) {
vo.setBankAccountId(getBankAccount().getId());
}
if (getInvoiceInfo() != null) {
vo.setInvoiceInfoId(getInvoiceInfo().getId());
}
if (getMainContact() != null) {
vo.setMainContactId(getMainContact().getId());
}
if (getSubContact() != null) {
vo.setSubContactId(getSubContact().getId());
}
vo.setAddress(getAddress());
vo.setUseBid(isUseBid());
vo.setUseOffer(isUseOffer());
vo.setAmount(getAmount());
vo.setStandardPayWay(isStandardPayWay());
vo.setPath(getPath());
vo.setCreated(getCreated());
vo.setPlannedStartTime(getPlannedStartTime());
vo.setPlannedCompletionTime(getPlannedCompletionTime());
vo.setDescription(getDescription());
vo.setVersion(version);
return vo;
}
}

15
common/src/main/java/com/ecep/contract/model/ProjectFile.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.ecep.contract.ProjectFileType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ProjectFileVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -29,7 +30,7 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_FILE")
@ToString
public class ProjectFile implements IdentityEntity, ProjectBasedEntity, java.io.Serializable {
public class ProjectFile implements IdentityEntity, ProjectBasedEntity, java.io.Serializable, Voable<ProjectFileVo> {
private static final long serialVersionUID = 1L;
@Id
@@ -66,4 +67,16 @@ public class ProjectFile implements IdentityEntity, ProjectBasedEntity, java.io.
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ProjectFileVo toVo() {
ProjectFileVo vo = new ProjectFileVo();
vo.setId(getId());
if (getProject() != null) {
vo.setProjectId(getProject().getId());
}
vo.setType(getType());
vo.setFilePath(getFilePath());
return vo;
}
}

27
common/src/main/java/com/ecep/contract/model/ProjectFundPlan.java
View File

@@ -6,6 +6,7 @@ import java.util.Objects;
import com.ecep.contract.ContractPayWay;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.ProjectFundPlanVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -32,7 +33,8 @@ import lombok.ToString;
@Entity
@Table(name = "PROJECT_FUND_PLAN")
@ToString
public class ProjectFundPlan implements IdentityEntity, ProjectBasedEntity, java.io.Serializable {
public class ProjectFundPlan
implements IdentityEntity, ProjectBasedEntity, java.io.Serializable, Voable<ProjectFundPlanVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -98,4 +100,27 @@ public class ProjectFundPlan implements IdentityEntity, ProjectBasedEntity, java
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public ProjectFundPlanVo toVo() {
ProjectFundPlanVo vo = new ProjectFundPlanVo();
vo.setId(id);
if (project != null) {
vo.setProjectId(project.getId());
vo.setProjectName(project.getName());
}
vo.setPayDate(payDate);
if (payWay != null) {
vo.setPayWay(payWay);
}
vo.setPayRatio(payRatio);
vo.setPayCurrency(payCurrency);
vo.setPayTerm(payTerm);
if (contractPayPlan != null) {
vo.setContractPayPlanId(contractPayPlan.getId());
// 注意：ContractPayPlan实体类中没有name字段，无法设置contractPayPlanName
}
vo.setUpdateDate(updateDate);
return vo;
}
}

32
common/src/main/java/com/ecep/contract/model/PurchaseBillVoucher.java
View File

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.PurchaseBillVoucherVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_BILL_VOUCHER", schema = "supplier_ms")
@ToString
public class PurchaseBillVoucher implements IdentityEntity, BasedEntity, java.io.Serializable {
public class PurchaseBillVoucher
implements IdentityEntity, BasedEntity, java.io.Serializable, Voable<PurchaseBillVoucherVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -126,4 +128,32 @@ public class PurchaseBillVoucher implements IdentityEntity, BasedEntity, java.io
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public PurchaseBillVoucherVo toVo() {
PurchaseBillVoucherVo vo = new PurchaseBillVoucherVo();
vo.setId(id);
vo.setRefId(refId);
vo.setCode(code);
if (company != null) {
vo.setCompanyId(company.getId());
}
if (invoice != null) {
vo.setInvoiceId(invoice.getId());
}
if (employee != null) {
vo.setEmployeeId(employee.getId());
}
if (maker != null) {
vo.setMakerId(maker.getId());
}
vo.setMakerDate(makerDate);
vo.setModifyDate(modifyDate);
if (verifier != null) {
vo.setVerifierId(verifier.getId());
}
vo.setVerifierDate(verifierDate);
vo.setDescription(description);
return vo;
}
}

30
common/src/main/java/com/ecep/contract/model/PurchaseBillVoucherItem.java
View File

@@ -3,6 +3,7 @@ package com.ecep.contract.model;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.PurchaseBillVoucherItemVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -26,7 +27,8 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_BILL_VOUCHER_ITEM", schema = "supplier_ms")
@ToString
public class PurchaseBillVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable {
public class PurchaseBillVoucherItem
implements IdentityEntity, BasedEntity, java.io.Serializable, Voable<PurchaseBillVoucherItemVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -109,4 +111,30 @@ public class PurchaseBillVoucherItem implements IdentityEntity, BasedEntity, jav
public String toPrettyString() {
return "#" + getId();
}
@Override
public PurchaseBillVoucherItemVo toVo() {
PurchaseBillVoucherItemVo vo = new PurchaseBillVoucherItemVo();
vo.setId(id);
vo.setRefId(refId);
if (voucher != null) {
vo.setVoucherId(voucher.getId());
}
if (orderItem != null) {
vo.setOrderItemId(orderItem.getId());
}
if (invoice != null) {
vo.setInvoiceId(invoice.getId());
}
if (inventory != null) {
vo.setInventoryId(inventory.getId());
}
if (contract != null) {
vo.setContractId(contract.getId());
}
vo.setQuantity(quantity);
vo.setPrice(price);
vo.setDescription(description);
return vo;
}
}

25
common/src/main/java/com/ecep/contract/model/PurchaseOrder.java
View File

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.PurchaseOrderVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,7 @@ import lombok.ToString;
@Entity
@Table(name = "PURCHASE_ORDER", schema = "supplier_ms")
@ToString
public class PurchaseOrder implements IdentityEntity, BasedEntity, ContractBasedEntity, java.io.Serializable {
public class PurchaseOrder implements IdentityEntity, BasedEntity, ContractBasedEntity, java.io.Serializable, Voable<PurchaseOrderVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -116,4 +117,26 @@ public class PurchaseOrder implements IdentityEntity, BasedEntity, ContractBased
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public PurchaseOrderVo toVo() {
PurchaseOrderVo vo = new PurchaseOrderVo();
vo.setId(id);
if (contract != null) {
vo.setContractId(contract.getId());
}
vo.setCode(code);
// PurchaseOrder中没有name字段，这里可以设置为code
vo.setName(code);
// PurchaseOrder中没有vendorId字段，只有vendorCode
// vo.setVendorId();
// PurchaseOrder中没有orderDate字段，这里可以设置为makerDate
if (makerDate != null) {
vo.setOrderDate(makerDate.toLocalDate());
}
// PurchaseOrder中没有totalAmount、taxAmount、taxRate和statusId字段，暂时不设置
vo.setRemark(description);
// active字段默认为false，在PurchaseOrderVo类中已经设置
return vo;
}
}

34
common/src/main/java/com/ecep/contract/model/PurchaseSettlementVoucherItem.java
View File

@@ -3,6 +3,7 @@ package com.ecep.contract.model;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.PurchaseSettlementVoucherItemVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -26,7 +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 {
public class PurchaseSettlementVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable, Voable<PurchaseSettlementVoucherItemVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -113,4 +114,35 @@ public class PurchaseSettlementVoucherItem implements IdentityEntity, BasedEntit
public String toPrettyString() {
return "#" + getId();
}
@Override
public PurchaseSettlementVoucherItemVo toVo() {
PurchaseSettlementVoucherItemVo vo = new PurchaseSettlementVoucherItemVo();
vo.setId(id);
vo.setRefId(refId);
if (voucher != null) {
vo.setVoucherId(voucher.getId());
vo.setVoucherCode(voucher.getCode());
}
if (accountant != null) {
vo.setAccountantId(accountant.getId());
vo.setAccountantName(accountant.getName());
}
if (invoice != null) {
vo.setInvoiceId(invoice.getId());
vo.setInvoiceCode(invoice.getCode());
}
if (receipt != null) {
vo.setReceiptId(receipt.getId());
vo.setReceiptCode(receipt.getCode());
}
if (inventory != null) {
vo.setInventoryId(inventory.getId());
vo.setInventoryName(inventory.getName());
}
vo.setQuantity(quantity);
vo.setPrice(price);
vo.setDescription(description);
return vo;
}
}

32
common/src/main/java/com/ecep/contract/model/SalesBillVoucher.java
View File

@@ -4,6 +4,7 @@ import java.time.LocalDateTime;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.SalesBillVoucherVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -27,7 +28,7 @@ import lombok.ToString;
@Entity
@Table(name = "SALES_BILL_VOUCHER", schema = "supplier_ms")
@ToString
public class SalesBillVoucher implements IdentityEntity, BasedEntity, java.io.Serializable {
public class SalesBillVoucher implements IdentityEntity, BasedEntity, java.io.Serializable, Voable<SalesBillVoucherVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -126,4 +127,33 @@ public class SalesBillVoucher implements IdentityEntity, BasedEntity, java.io.Se
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public SalesBillVoucherVo toVo() {
SalesBillVoucherVo vo = new SalesBillVoucherVo();
vo.setId(id);
vo.setRefId(refId);
vo.setCode(code);
if (company != null) {
vo.setCompanyId(company.getId());
}
if (order != null) {
vo.setOrderId(order.getId());
vo.setOrderCode(order.getCode());
}
if (employee != null) {
vo.setEmployeeId(employee.getId());
}
if (maker != null) {
vo.setMakerId(maker.getId());
}
vo.setMakerDate(makerDate);
vo.setModifyDate(modifyDate);
if (verifier != null) {
vo.setVerifierId(verifier.getId());
}
vo.setVerifierDate(verifierDate);
vo.setDescription(description);
return vo;
}
}

22
common/src/main/java/com/ecep/contract/model/SalesBillVoucherItem.java
View File

@@ -3,6 +3,7 @@ package com.ecep.contract.model;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.SalesBillVoucherItemVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -26,7 +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 {
public class SalesBillVoucherItem implements IdentityEntity, BasedEntity, java.io.Serializable, Voable<SalesBillVoucherItemVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -88,4 +89,23 @@ public class SalesBillVoucherItem implements IdentityEntity, BasedEntity, java.i
public String toPrettyString() {
return "#" + getId();
}
@Override
public SalesBillVoucherItemVo toVo() {
SalesBillVoucherItemVo vo = new SalesBillVoucherItemVo();
vo.setId(id);
vo.setRefId(refId);
if (voucher != null) {
vo.setVoucherId(voucher.getId());
vo.setVoucherCode(voucher.getCode());
}
if (inventory != null) {
vo.setInventoryId(inventory.getId());
vo.setInventoryName(inventory.getName());
}
vo.setQuantity(quantity);
vo.setPrice(price);
vo.setDescription(description);
return vo;
}
}

28
common/src/main/java/com/ecep/contract/model/SalesOrder.java
View File

@@ -5,6 +5,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.SalesOrderVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -28,7 +29,8 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_SALES_ORDER", schema = "supplier_ms")
@ToString
public class SalesOrder implements IdentityEntity, BasedEntity, ContractBasedEntity, Serializable {
public class SalesOrder
implements IdentityEntity, BasedEntity, ContractBasedEntity, Serializable, Voable<SalesOrderVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -104,4 +106,28 @@ public class SalesOrder implements IdentityEntity, BasedEntity, ContractBasedEnt
public String toPrettyString() {
return "#" + getId();
}
@Override
public SalesOrderVo toVo() {
SalesOrderVo vo = new SalesOrderVo();
vo.setId(id);
if (contract != null) {
vo.setContractId(contract.getId());
}
vo.setCode(code);
if (employee != null) {
vo.setEmployeeId(employee.getId());
}
if (maker != null) {
vo.setMakerId(maker.getId());
}
vo.setMakerDate(makerDate);
if (verifier != null) {
vo.setVerifierId(verifier.getId());
}
vo.setVerifierDate(verifierDate);
// active字段默认为false，在SalesOrderVo类中已经设置
return vo;
}
}

23
common/src/main/java/com/ecep/contract/model/SalesOrderItem.java
View File

@@ -5,6 +5,7 @@ import java.time.LocalDate;
import java.util.Objects;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.SalesOrderItemVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -28,7 +29,7 @@ import lombok.ToString;
@Entity
@Table(name = "CONTRACT_SALES_ORDER_ITEM", schema = "supplier_ms")
@ToString
public class SalesOrderItem implements IdentityEntity, BasedEntity, Serializable {
public class SalesOrderItem implements IdentityEntity, BasedEntity, Serializable, Voable<SalesOrderItemVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -98,4 +99,24 @@ public class SalesOrderItem implements IdentityEntity, BasedEntity, Serializable
public String toPrettyString() {
return "#" + getId();
}
@Override
public SalesOrderItemVo toVo() {
SalesOrderItemVo vo = new SalesOrderItemVo();
vo.setId(id);
vo.setCode(code);
vo.setName(name);
if (order != null) {
vo.setSalesOrderId(order.getId());
}
vo.setItemName(name);
vo.setQuantity(quantity);
vo.setPrice(price);
vo.setTaxRate(taxRate);
vo.setExclusiveTaxPrice(exclusiveTaxPrice);
vo.setStartDate(startDate);
vo.setEndDate(endDate);
vo.setDescription(description);
return vo;
}
}

15
common/src/main/java/com/ecep/contract/model/Unit.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.ecep.contract.UnitType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.UnitVo;
import jakarta.persistence.Column;
import jakarta.persistence.EnumType;
@@ -23,7 +24,7 @@ import lombok.Setter;
@Setter
@jakarta.persistence.Entity
@Table(name = "UNIT", schema = "supplier_ms")
public class Unit implements IdentityEntity, NamedEntity, Serializable {
public class Unit implements IdentityEntity, NamedEntity, Serializable, Voable<UnitVo> {
private static final long serialVersionUID = 1L;
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -66,4 +67,16 @@ public class Unit implements IdentityEntity, NamedEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public UnitVo toVo() {
UnitVo vo = new UnitVo();
vo.setId(id);
vo.setCode(code);
vo.setName(name);
vo.setUnitType(unitType);
vo.setRatio(ratio);
vo.setStandard(standard);
return vo;
}
}

13
common/src/main/java/com/ecep/contract/model/VendorCatalog.java
View File

@@ -5,6 +5,7 @@ import java.util.Objects;
import com.ecep.contract.VendorType;
import com.ecep.contract.util.HibernateProxyUtils;
import com.ecep.contract.vo.VendorCatalogVo;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
@@ -24,7 +25,7 @@ import lombok.ToString;
@Entity
@Table(name = "VENDOR_CATALOG", schema = "supplier_ms")
@ToString
public class VendorCatalog implements BasedEntity, Serializable {
public class VendorCatalog implements BasedEntity, Serializable, Voable<VendorCatalogVo> {
private static final long serialVersionUID = 1L;
@Id
@Column(name = "ID", nullable = false)
@@ -62,4 +63,14 @@ public class VendorCatalog implements BasedEntity, Serializable {
public final int hashCode() {
return HibernateProxyUtils.hashCode(this);
}
@Override
public VendorCatalogVo toVo() {
VendorCatalogVo vo = new VendorCatalogVo();
vo.setId(id);
vo.setCode(code);
vo.setName(name);
vo.setType(type);
return vo;
}
}

10
common/src/main/java/com/ecep/contract/model/Voable.java Normal file
View File

@@ -0,0 +1,10 @@
package com.ecep.contract.model;
public interface Voable<T> {
/**
* 转换为Vo
*
* @return
*/
T toVo();
}