feat(vo): 新增并更新多个VO类实现ContractBasedVo接口
新增CloudTycVo、CloudYuVo、ExtendVendorInfoVo等VO类 更新SalesOrderVo、PurchaseOrderVo等实现ContractBasedVo接口 统一布尔类型字段为boolean并设置默认值false
This commit is contained in:
30
common/src/main/java/com/ecep/contract/vo/CloudRkVo.java
Normal file
30
common/src/main/java/com/ecep/contract/vo/CloudRkVo.java
Normal file
@@ -0,0 +1,30 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CloudRkVo implements IdentityEntity {
|
||||
private Integer id;
|
||||
private String cloudId;
|
||||
private Integer companyId;
|
||||
private boolean autoUpdate = false;
|
||||
private int updateDays;
|
||||
private String customerGrade;
|
||||
private Integer customerScore;
|
||||
private String customerDescription;
|
||||
private String vendorGrade;
|
||||
private Integer vendorScore;
|
||||
private String vendorDescription;
|
||||
private String rank;
|
||||
private String rankDescription;
|
||||
private LocalDateTime cloudLatest;
|
||||
private LocalDateTime cloudBlackListUpdated;
|
||||
private LocalDateTime cloudEntUpdate;
|
||||
private String description;
|
||||
private LocalDateTime latestUpdate;
|
||||
private Integer version;
|
||||
}
|
||||
19
common/src/main/java/com/ecep/contract/vo/CloudTycVo.java
Normal file
19
common/src/main/java/com/ecep/contract/vo/CloudTycVo.java
Normal file
@@ -0,0 +1,19 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.time.Instant;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CloudTycVo implements IdentityEntity, CompanyBasedVo {
|
||||
private Integer id;
|
||||
private Integer score;
|
||||
private Instant cloudLatest;
|
||||
private String cloudId;
|
||||
private Instant latestUpdate;
|
||||
private Integer companyId;
|
||||
private int version;
|
||||
private boolean active = false;
|
||||
}
|
||||
20
common/src/main/java/com/ecep/contract/vo/CloudYuVo.java
Normal file
20
common/src/main/java/com/ecep/contract/vo/CloudYuVo.java
Normal file
@@ -0,0 +1,20 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.time.Instant;
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CloudYuVo implements IdentityEntity {
|
||||
private Integer id;
|
||||
private Instant latestUpdate;
|
||||
private Integer companyId;
|
||||
private String exceptionMessage;
|
||||
private LocalDate vendorUpdateDate;
|
||||
private LocalDate customerUpdateDate;
|
||||
private Instant cloudLatest;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -1,4 +1,7 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
public interface ContractBasedVo {
|
||||
Integer getContractId();
|
||||
|
||||
void setContractId(Integer contractId);
|
||||
}
|
||||
|
||||
@@ -4,11 +4,10 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractBidVendorVo implements IdentityEntity {
|
||||
public class ContractBidVendorVo implements IdentityEntity, ContractBasedVo, CompanyBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private Integer quotationSheetFileId;
|
||||
private String quotationSheetFileName;
|
||||
}
|
||||
@@ -1,12 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.ContractFileType;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractFileVo implements IdentityEntity {
|
||||
public class ContractFileVo implements IdentityEntity, ContractBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private ContractFileType type;
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractItemVo implements IdentityEntity {
|
||||
public class ContractItemVo implements IdentityEntity, ContractBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private String contractCode;
|
||||
private String contractName;
|
||||
private Integer refId;
|
||||
private String itemCode;
|
||||
private String title;
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
|
||||
import java.time.LocalDate;
|
||||
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ContractPayPlanVo implements IdentityEntity {
|
||||
public class ContractPayPlanVo implements IdentityEntity, ContractBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer order;
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 扩展供应商信息VO类
|
||||
*/
|
||||
@Data
|
||||
public class ExtendVendorInfoVo implements IdentityEntity, ContractBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer vendorGroupId;
|
||||
/**
|
||||
* 合同序号
|
||||
*/
|
||||
private int codeSequenceNumber;
|
||||
/**
|
||||
* 是否为指定供应商
|
||||
*/
|
||||
private boolean assignedProvider = false;
|
||||
/**
|
||||
* 是否为预采购
|
||||
*/
|
||||
private boolean prePurchase = false;
|
||||
}
|
||||
29
common/src/main/java/com/ecep/contract/vo/ProjectBidVo.java
Normal file
29
common/src/main/java/com/ecep/contract/vo/ProjectBidVo.java
Normal file
@@ -0,0 +1,29 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectBidVo implements IdentityEntity, ProjectBasedVo {
|
||||
private Integer id;
|
||||
private Integer projectId;
|
||||
private int level;
|
||||
private double amount;
|
||||
private Integer evaluationFileId;
|
||||
private Integer costId;
|
||||
private boolean standardPayWay = false;
|
||||
private String noStandardPayWayText;
|
||||
private boolean standardContractText = false;
|
||||
private String noStandardContractText;
|
||||
private String authorizationFile;
|
||||
private String bidAcceptanceLetterFile;
|
||||
private Integer applicantId;
|
||||
private String applicantName;
|
||||
private LocalDateTime applyTime;
|
||||
private Integer authorizerId;
|
||||
private String authorizerName;
|
||||
private LocalDateTime authorizationTime;
|
||||
private String description;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -5,14 +5,14 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectCostVo implements IdentityEntity {
|
||||
public class ProjectCostVo implements IdentityEntity, ProjectBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private Integer projectId;
|
||||
private int version;
|
||||
private boolean standardPayWay;
|
||||
private boolean standardPayWay = false;
|
||||
private String noStandardPayWayText;
|
||||
private boolean standardContractText;
|
||||
private boolean standardContractText = false;
|
||||
private String noStandardContractText;
|
||||
private float stampTax;
|
||||
private float stampTaxFee;
|
||||
@@ -37,5 +37,5 @@ public class ProjectCostVo implements IdentityEntity {
|
||||
private LocalDateTime authorizationTime;
|
||||
private String authorizationFile;
|
||||
private String description;
|
||||
private boolean importLock;
|
||||
private boolean importLock = false;
|
||||
}
|
||||
@@ -0,0 +1,25 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDateTime;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class ProjectQuotationVo implements IdentityEntity, ProjectBasedVo {
|
||||
private Integer id;
|
||||
private Integer projectId;
|
||||
private int level;
|
||||
private boolean standardPayWay = false;
|
||||
private String noStandardPayWayText;
|
||||
private double amount;
|
||||
private Integer applicantId;
|
||||
private String applicantName;
|
||||
private LocalDateTime applyTime;
|
||||
private Integer authorizerId;
|
||||
private String authorizerName;
|
||||
private LocalDateTime authorizationTime;
|
||||
private String authorizationFile;
|
||||
private String description;
|
||||
private Integer evaluationFileId;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -5,7 +5,7 @@ import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PurchaseOrderVo implements IdentityEntity {
|
||||
public class PurchaseOrderVo implements IdentityEntity, ContractBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private String code;
|
||||
|
||||
@@ -5,7 +5,7 @@ import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class SalesOrderVo implements IdentityEntity {
|
||||
public class SalesOrderVo implements IdentityEntity, ContractBasedVo {
|
||||
private Integer id;
|
||||
private Integer contractId;
|
||||
private String code;
|
||||
|
||||
22
common/src/main/java/com/ecep/contract/vo/VendorGroupVo.java
Normal file
22
common/src/main/java/com/ecep/contract/vo/VendorGroupVo.java
Normal file
@@ -0,0 +1,22 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
/**
|
||||
* 供应商分组VO类
|
||||
*/
|
||||
@Data
|
||||
public class VendorGroupVo implements IdentityEntity, NamedEntity {
|
||||
private Integer id;
|
||||
private String name;
|
||||
private String code;
|
||||
private String path;
|
||||
private String description;
|
||||
private boolean active = false;
|
||||
private boolean priceComparison = false;
|
||||
private boolean requireQuotationSheetForBid = false;
|
||||
private boolean canPrePurchase = false;
|
||||
private int version;
|
||||
}
|
||||
Reference in New Issue
Block a user