refactor(client): 重构银行和公司相关代码
- 更新了多个类中的导入语句,替换了模型类为对应的VO类 - 优化了部分方法的参数和返回类型,使用VO类替代模型类 - 重构了自动补全功能,使用统一的泛型方法 - 添加了缓存注解,提高了数据访问性能 - 优化了部分代码结构,提高了可维护性
This commit is contained in:
@@ -4,7 +4,7 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyBankAccountVo implements IdentityEntity {
|
||||
public class CompanyBankAccountVo implements IdentityEntity, CompanyBasedVo {
|
||||
private Integer id;
|
||||
/**
|
||||
* 公司id
|
||||
|
||||
@@ -0,0 +1,7 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
public interface CompanyBasedVo {
|
||||
Integer getCompanyId();
|
||||
|
||||
void setCompanyId(Integer companyId);
|
||||
}
|
||||
@@ -6,10 +6,9 @@ import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyBlackReasonVo implements IdentityEntity {
|
||||
public class CompanyBlackReasonVo implements IdentityEntity ,CompanyBasedVo{
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private BlackReasonType type;
|
||||
private String applyName;
|
||||
private LocalDate applyDate;
|
||||
|
||||
@@ -6,10 +6,9 @@ import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyContactVo implements IdentityEntity, NamedEntity {
|
||||
public class CompanyContactVo implements IdentityEntity, NamedEntity ,CompanyBasedVo{
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private String name;
|
||||
private String position;
|
||||
private String phone;
|
||||
|
||||
@@ -4,10 +4,9 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyContractVo implements IdentityEntity {
|
||||
public class CompanyContractVo implements IdentityEntity ,CompanyBasedVo{
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private Integer contractId;
|
||||
private String contractCode;
|
||||
private String contractName;
|
||||
|
||||
@@ -9,7 +9,6 @@ import lombok.Data;
|
||||
public class CompanyCustomerFileVo implements IdentityEntity {
|
||||
private Integer id;
|
||||
private Integer customerId;
|
||||
private String customerName;
|
||||
private CompanyCustomerFileType type;
|
||||
private String filePath;
|
||||
private String editFilePath;
|
||||
|
||||
@@ -6,10 +6,9 @@ import java.time.LocalDate;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyCustomerVo implements IdentityEntity {
|
||||
public class CompanyCustomerVo implements IdentityEntity,CompanyBasedVo {
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private LocalDate developDate;
|
||||
private String path;
|
||||
private Integer companyContactId;
|
||||
|
||||
@@ -4,10 +4,9 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyExtendInfoVo implements IdentityEntity {
|
||||
public class CompanyExtendInfoVo implements IdentityEntity, CompanyBasedVo {
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private boolean disableVerify = false;
|
||||
private int version = 0;
|
||||
}
|
||||
@@ -8,11 +8,10 @@ import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyFileVo implements IdentityEntity {
|
||||
public class CompanyFileVo implements IdentityEntity, CompanyBasedVo {
|
||||
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private CompanyFileType type;
|
||||
private LocalDate applyDate;
|
||||
private LocalDate expiringDate;
|
||||
|
||||
@@ -5,11 +5,10 @@ import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyInvoiceInfoVo implements IdentityEntity, NamedEntity {
|
||||
public class CompanyInvoiceInfoVo implements IdentityEntity, NamedEntity, CompanyBasedVo {
|
||||
private Integer id;
|
||||
private String name;
|
||||
private Integer companyId;
|
||||
private String companyName;
|
||||
private String taxId;
|
||||
private String address;
|
||||
private String phone;
|
||||
|
||||
@@ -8,7 +8,7 @@ import com.ecep.contract.model.NamedEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class CompanyOldNameVo implements IdentityEntity, NamedEntity {
|
||||
public class CompanyOldNameVo implements IdentityEntity, NamedEntity, CompanyBasedVo {
|
||||
private Integer id;
|
||||
private Integer companyId;
|
||||
private String name;
|
||||
|
||||
@@ -13,8 +13,8 @@ public class InventoryVo implements IdentityEntity {
|
||||
private Integer catalogId;
|
||||
private String catalogName;
|
||||
private String specification;
|
||||
private boolean specificationLock;
|
||||
private boolean nameLock;
|
||||
private boolean specificationLock = false;
|
||||
private boolean nameLock = false;
|
||||
private Double purchaseTax;
|
||||
private Double purchasePrice;
|
||||
private Double purchaseTaxPrice;
|
||||
|
||||
@@ -18,5 +18,5 @@ public class InvoiceVo implements IdentityEntity {
|
||||
private Double totalAmount;
|
||||
private Integer invoiceStatusId;
|
||||
private String remark;
|
||||
private Boolean active;
|
||||
private Boolean active = false;
|
||||
}
|
||||
@@ -17,5 +17,5 @@ public class PurchaseOrderVo implements IdentityEntity {
|
||||
private Double taxRate;
|
||||
private Integer statusId;
|
||||
private String remark;
|
||||
private Boolean active;
|
||||
private Boolean active = false;
|
||||
}
|
||||
@@ -1,16 +1,16 @@
|
||||
package com.ecep.contract.vo;
|
||||
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import java.time.LocalDate;
|
||||
import com.ecep.contract.model.IdentityEntity;
|
||||
import lombok.Data;
|
||||
|
||||
@Data
|
||||
public class PurchaseReceiptVo implements IdentityEntity {
|
||||
private Integer id;
|
||||
private Integer purchaseOrderId;
|
||||
private String code;
|
||||
private LocalDate receiptDate;
|
||||
private Integer receivedByEmployeeId;
|
||||
private String remark;
|
||||
private Boolean active;
|
||||
private Integer orderId;
|
||||
private LocalDate verifierDate;
|
||||
private LocalDate arriveDate;
|
||||
private String description;
|
||||
private boolean active = false;
|
||||
}
|
||||
@@ -17,5 +17,5 @@ public class SalesOrderVo implements IdentityEntity {
|
||||
private Double taxRate;
|
||||
private Integer statusId;
|
||||
private String remark;
|
||||
private Boolean active;
|
||||
private Boolean active = false;
|
||||
}
|
||||
Reference in New Issue
Block a user