diff --git a/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/FundReceipt.java b/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/FundReceipt.java index 6650b06..3c09780 100644 --- a/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/FundReceipt.java +++ b/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/FundReceipt.java @@ -43,13 +43,13 @@ public class FundReceipt extends BaseEntity { private String purpose; /** 关联项目ID */ - private Long projectId; + private String projectId; /** 关联客户ID */ - private Long customerId; + private String customerId; /** 关联应收款ID */ - private Long receivableId; + private String receivableId; /** 收款状态(0-待确认 1-已确认 2-已核销) */ private Integer receiptStatus; @@ -58,13 +58,13 @@ public class FundReceipt extends BaseEntity { private LocalDateTime confirmTime; /** 确认人ID */ - private Long confirmBy; + private String confirmBy; /** 核销时间 */ private LocalDateTime writeOffTime; /** 核销人ID */ - private Long writeOffBy; + private String writeOffBy; /** 收款凭证 */ private String voucher; @@ -95,22 +95,22 @@ public class FundReceipt extends BaseEntity { public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; } public String getPurpose() { return purpose; } public void setPurpose(String purpose) { this.purpose = purpose; } - public Long getProjectId() { return projectId; } - public void setProjectId(Long projectId) { this.projectId = projectId; } - public Long getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { this.customerId = customerId; } - public Long getReceivableId() { return receivableId; } - public void setReceivableId(Long receivableId) { this.receivableId = receivableId; } + public String getProjectId() { return projectId; } + public void setProjectId(String projectId) { this.projectId = projectId; } + public String getCustomerId() { return customerId; } + public void setCustomerId(String customerId) { this.customerId = customerId; } + public String getReceivableId() { return receivableId; } + public void setReceivableId(String receivableId) { this.receivableId = receivableId; } public Integer getReceiptStatus() { return receiptStatus; } public void setReceiptStatus(Integer receiptStatus) { this.receiptStatus = receiptStatus; } public LocalDateTime getConfirmTime() { return confirmTime; } public void setConfirmTime(LocalDateTime confirmTime) { this.confirmTime = confirmTime; } - public Long getConfirmBy() { return confirmBy; } - public void setConfirmBy(Long confirmBy) { this.confirmBy = confirmBy; } + public String getConfirmBy() { return confirmBy; } + public void setConfirmBy(String confirmBy) { this.confirmBy = confirmBy; } public LocalDateTime getWriteOffTime() { return writeOffTime; } public void setWriteOffTime(LocalDateTime writeOffTime) { this.writeOffTime = writeOffTime; } - public Long getWriteOffBy() { return writeOffBy; } - public void setWriteOffBy(Long writeOffBy) { this.writeOffBy = writeOffBy; } + public String getWriteOffBy() { return writeOffBy; } + public void setWriteOffBy(String writeOffBy) { this.writeOffBy = writeOffBy; } public String getVoucher() { return voucher; } public void setVoucher(String voucher) { this.voucher = voucher; } public String getInvoiceNo() { return invoiceNo; } diff --git a/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/Receivable.java b/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/Receivable.java index 9799b12..4a5ca6b 100644 --- a/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/Receivable.java +++ b/fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/Receivable.java @@ -17,13 +17,13 @@ public class Receivable extends BaseEntity { private String receivableCode; /** 关联需求ID */ - private Long requirementId; + private String requirementId; /** 关联项目ID */ - private Long projectId; + private String projectId; /** 关联客户ID */ - private Long customerId; + private String customerId; /** 应收款金额 */ private BigDecimal receivableAmount; @@ -59,7 +59,7 @@ public class Receivable extends BaseEntity { private LocalDateTime confirmTime; /** 确认人ID */ - private Long confirmBy; + private String confirmBy; /** 备注 */ private String remark; @@ -72,27 +72,27 @@ public class Receivable extends BaseEntity { this.receivableCode = receivableCode; } - public Long getRequirementId() { + public String getRequirementId() { return requirementId; } - public void setRequirementId(Long requirementId) { + public void setRequirementId(String requirementId) { this.requirementId = requirementId; } - public Long getProjectId() { + public String getProjectId() { return projectId; } - public void setProjectId(Long projectId) { + public void setProjectId(String projectId) { this.projectId = projectId; } - public Long getCustomerId() { + public String getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { + public void setCustomerId(String customerId) { this.customerId = customerId; } @@ -184,11 +184,11 @@ public class Receivable extends BaseEntity { this.confirmTime = confirmTime; } - public Long getConfirmBy() { + public String getConfirmBy() { return confirmBy; } - public void setConfirmBy(Long confirmBy) { + public void setConfirmBy(String confirmBy) { this.confirmBy = confirmBy; } diff --git a/fund-receipt/src/main/java/com/fundplatform/receipt/dto/FundReceiptDTO.java b/fund-receipt/src/main/java/com/fundplatform/receipt/dto/FundReceiptDTO.java index 14e3cdd..a4a6b96 100644 --- a/fund-receipt/src/main/java/com/fundplatform/receipt/dto/FundReceiptDTO.java +++ b/fund-receipt/src/main/java/com/fundplatform/receipt/dto/FundReceiptDTO.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; public class FundReceiptDTO { - private Long id; + private String id; @NotBlank(message = "收款标题不能为空") private String title; @@ -29,15 +29,15 @@ public class FundReceiptDTO { private String payerAccount; private LocalDateTime receiptDate; private String purpose; - private Long projectId; - private Long customerId; + private String projectId; + private String customerId; private String invoiceNo; private String voucher; private String attachments; private String remark; - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } + public String getId() { return id; } + public void setId(String id) { this.id = id; } public String getTitle() { return title; } public void setTitle(String title) { this.title = title; } public BigDecimal getAmount() { return amount; } @@ -56,10 +56,10 @@ public class FundReceiptDTO { public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; } public String getPurpose() { return purpose; } public void setPurpose(String purpose) { this.purpose = purpose; } - public Long getProjectId() { return projectId; } - public void setProjectId(Long projectId) { this.projectId = projectId; } - public Long getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { this.customerId = customerId; } + public String getProjectId() { return projectId; } + public void setProjectId(String projectId) { this.projectId = projectId; } + public String getCustomerId() { return customerId; } + public void setCustomerId(String customerId) { this.customerId = customerId; } public String getInvoiceNo() { return invoiceNo; } public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; } public String getVoucher() { return voucher; } diff --git a/fund-receipt/src/main/java/com/fundplatform/receipt/dto/ReceivableDTO.java b/fund-receipt/src/main/java/com/fundplatform/receipt/dto/ReceivableDTO.java index 80ed5ca..2041788 100644 --- a/fund-receipt/src/main/java/com/fundplatform/receipt/dto/ReceivableDTO.java +++ b/fund-receipt/src/main/java/com/fundplatform/receipt/dto/ReceivableDTO.java @@ -12,15 +12,15 @@ import java.time.LocalDate; */ public class ReceivableDTO { - private Long id; + private String id; - private Long requirementId; + private String requirementId; @NotNull(message = "项目ID不能为空") - private Long projectId; + private String projectId; @NotNull(message = "客户ID不能为空") - private Long customerId; + private String customerId; @NotNull(message = "应收款金额不能为空") @Positive(message = "应收款金额必须大于0") @@ -37,35 +37,35 @@ public class ReceivableDTO { private String remark; - public Long getId() { + public String getId() { return id; } - public void setId(Long id) { + public void setId(String id) { this.id = id; } - public Long getRequirementId() { + public String getRequirementId() { return requirementId; } - public void setRequirementId(Long requirementId) { + public void setRequirementId(String requirementId) { this.requirementId = requirementId; } - public Long getProjectId() { + public String getProjectId() { return projectId; } - public void setProjectId(Long projectId) { + public void setProjectId(String projectId) { this.projectId = projectId; } - public Long getCustomerId() { + public String getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { + public void setCustomerId(String customerId) { this.customerId = customerId; } diff --git a/fund-receipt/src/main/java/com/fundplatform/receipt/vo/FundReceiptVO.java b/fund-receipt/src/main/java/com/fundplatform/receipt/vo/FundReceiptVO.java index b610222..bf13457 100644 --- a/fund-receipt/src/main/java/com/fundplatform/receipt/vo/FundReceiptVO.java +++ b/fund-receipt/src/main/java/com/fundplatform/receipt/vo/FundReceiptVO.java @@ -5,7 +5,7 @@ import java.time.LocalDateTime; public class FundReceiptVO { - private Long id; + private String id; private String receiptNo; private String title; private BigDecimal amount; @@ -17,24 +17,24 @@ public class FundReceiptVO { private String payerAccount; private LocalDateTime receiptDate; private String purpose; - private Long projectId; - private Long customerId; - private Long receivableId; + private String projectId; + private String customerId; + private String receivableId; private Integer receiptStatus; private String receiptStatusName; private LocalDateTime confirmTime; - private Long confirmBy; + private String confirmBy; private LocalDateTime writeOffTime; - private Long writeOffBy; + private String writeOffBy; private String voucher; private String invoiceNo; private String attachments; - private Long tenantId; - private Long createdBy; + private String tenantId; + private String createdBy; private LocalDateTime createdTime; - public Long getId() { return id; } - public void setId(Long id) { this.id = id; } + public String getId() { return id; } + public void setId(String id) { this.id = id; } public String getReceiptNo() { return receiptNo; } public void setReceiptNo(String receiptNo) { this.receiptNo = receiptNo; } public String getTitle() { return title; } @@ -57,34 +57,34 @@ public class FundReceiptVO { public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; } public String getPurpose() { return purpose; } public void setPurpose(String purpose) { this.purpose = purpose; } - public Long getProjectId() { return projectId; } - public void setProjectId(Long projectId) { this.projectId = projectId; } - public Long getCustomerId() { return customerId; } - public void setCustomerId(Long customerId) { this.customerId = customerId; } - public Long getReceivableId() { return receivableId; } - public void setReceivableId(Long receivableId) { this.receivableId = receivableId; } + public String getProjectId() { return projectId; } + public void setProjectId(String projectId) { this.projectId = projectId; } + public String getCustomerId() { return customerId; } + public void setCustomerId(String customerId) { this.customerId = customerId; } + public String getReceivableId() { return receivableId; } + public void setReceivableId(String receivableId) { this.receivableId = receivableId; } public Integer getReceiptStatus() { return receiptStatus; } public void setReceiptStatus(Integer receiptStatus) { this.receiptStatus = receiptStatus; } public String getReceiptStatusName() { return receiptStatusName; } public void setReceiptStatusName(String receiptStatusName) { this.receiptStatusName = receiptStatusName; } public LocalDateTime getConfirmTime() { return confirmTime; } public void setConfirmTime(LocalDateTime confirmTime) { this.confirmTime = confirmTime; } - public Long getConfirmBy() { return confirmBy; } - public void setConfirmBy(Long confirmBy) { this.confirmBy = confirmBy; } + public String getConfirmBy() { return confirmBy; } + public void setConfirmBy(String confirmBy) { this.confirmBy = confirmBy; } public LocalDateTime getWriteOffTime() { return writeOffTime; } public void setWriteOffTime(LocalDateTime writeOffTime) { this.writeOffTime = writeOffTime; } - public Long getWriteOffBy() { return writeOffBy; } - public void setWriteOffBy(Long writeOffBy) { this.writeOffBy = writeOffBy; } + public String getWriteOffBy() { return writeOffBy; } + public void setWriteOffBy(String writeOffBy) { this.writeOffBy = writeOffBy; } public String getVoucher() { return voucher; } public void setVoucher(String voucher) { this.voucher = voucher; } public String getInvoiceNo() { return invoiceNo; } public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; } public String getAttachments() { return attachments; } public void setAttachments(String attachments) { this.attachments = attachments; } - public Long getTenantId() { return tenantId; } - public void setTenantId(Long tenantId) { this.tenantId = tenantId; } - public Long getCreatedBy() { return createdBy; } - public void setCreatedBy(Long createdBy) { this.createdBy = createdBy; } + public String getTenantId() { return tenantId; } + public void setTenantId(String tenantId) { this.tenantId = tenantId; } + public String getCreatedBy() { return createdBy; } + public void setCreatedBy(String createdBy) { this.createdBy = createdBy; } public LocalDateTime getCreatedTime() { return createdTime; } public void setCreatedTime(LocalDateTime createdTime) { this.createdTime = createdTime; } }