wjbl/fundplatform
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(receipt):完善收款管理模块功能

Browse Source 
- 优化FundReceipt收款实体类和Receivable应收实体类
- 更新DTO和VO数据传输对象
-增强收款管理业务逻辑
This commit is contained in:
zhangjf 2026-03-02 07:31:21 +08:00
parent 5425271f94
commit 46b6b2c396
5 changed files with 72 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/FundReceipt.java
View File

@ -43,13 +43,13 @@ public class FundReceipt extends BaseEntity {
private String purpose; private String purpose;
/** 关联项目ID */ /** 关联项目ID */
private Long projectId; private String projectId;
/** 关联客户ID */ /** 关联客户ID */
private Long customerId; private String customerId;
/** 关联应收款ID */ /** 关联应收款ID */
private Long receivableId; private String receivableId;
/** 收款状态(0-待确认 1-已确认 2-已核销) */ /** 收款状态(0-待确认 1-已确认 2-已核销) */
private Integer receiptStatus; private Integer receiptStatus;
@ -58,13 +58,13 @@ public class FundReceipt extends BaseEntity {
private LocalDateTime confirmTime; private LocalDateTime confirmTime;
/** 确认人ID */ /** 确认人ID */
private Long confirmBy; private String confirmBy;
/** 核销时间 */ /** 核销时间 */
private LocalDateTime writeOffTime; private LocalDateTime writeOffTime;
/** 核销人ID */ /** 核销人ID */
private Long writeOffBy; private String writeOffBy;
/** 收款凭证 */ /** 收款凭证 */
private String voucher; private String voucher;
@ -95,22 +95,22 @@ public class FundReceipt extends BaseEntity {
public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; } public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; }
public String getPurpose() { return purpose; } public String getPurpose() { return purpose; }
public void setPurpose(String purpose) { this.purpose = purpose; } public void setPurpose(String purpose) { this.purpose = purpose; }
public Long getProjectId() { return projectId; } public String getProjectId() { return projectId; }
public void setProjectId(Long projectId) { this.projectId = projectId; } public void setProjectId(String projectId) { this.projectId = projectId; }
public Long getCustomerId() { return customerId; } public String getCustomerId() { return customerId; }
public void setCustomerId(Long customerId) { this.customerId = customerId; } public void setCustomerId(String customerId) { this.customerId = customerId; }
public Long getReceivableId() { return receivableId; } public String getReceivableId() { return receivableId; }
public void setReceivableId(Long receivableId) { this.receivableId = receivableId; } public void setReceivableId(String receivableId) { this.receivableId = receivableId; }
public Integer getReceiptStatus() { return receiptStatus; } public Integer getReceiptStatus() { return receiptStatus; }
public void setReceiptStatus(Integer receiptStatus) { this.receiptStatus = receiptStatus; } public void setReceiptStatus(Integer receiptStatus) { this.receiptStatus = receiptStatus; }
public LocalDateTime getConfirmTime() { return confirmTime; } public LocalDateTime getConfirmTime() { return confirmTime; }
public void setConfirmTime(LocalDateTime confirmTime) { this.confirmTime = confirmTime; } public void setConfirmTime(LocalDateTime confirmTime) { this.confirmTime = confirmTime; }
public Long getConfirmBy() { return confirmBy; } public String getConfirmBy() { return confirmBy; }
public void setConfirmBy(Long confirmBy) { this.confirmBy = confirmBy; } public void setConfirmBy(String confirmBy) { this.confirmBy = confirmBy; }
public LocalDateTime getWriteOffTime() { return writeOffTime; } public LocalDateTime getWriteOffTime() { return writeOffTime; }
public void setWriteOffTime(LocalDateTime writeOffTime) { this.writeOffTime = writeOffTime; } public void setWriteOffTime(LocalDateTime writeOffTime) { this.writeOffTime = writeOffTime; }
public Long getWriteOffBy() { return writeOffBy; } public String getWriteOffBy() { return writeOffBy; }
public void setWriteOffBy(Long writeOffBy) { this.writeOffBy = writeOffBy; } public void setWriteOffBy(String writeOffBy) { this.writeOffBy = writeOffBy; }
public String getVoucher() { return voucher; } public String getVoucher() { return voucher; }
public void setVoucher(String voucher) { this.voucher = voucher; } public void setVoucher(String voucher) { this.voucher = voucher; }
public String getInvoiceNo() { return invoiceNo; } public String getInvoiceNo() { return invoiceNo; }

24
fund-receipt/src/main/java/com/fundplatform/receipt/data/entity/Receivable.java
View File

@ -17,13 +17,13 @@ public class Receivable extends BaseEntity {
private String receivableCode; private String receivableCode;
/** 关联需求ID */ /** 关联需求ID */
private Long requirementId; private String requirementId;
/** 关联项目ID */ /** 关联项目ID */
private Long projectId; private String projectId;
/** 关联客户ID */ /** 关联客户ID */
private Long customerId; private String customerId;
/** 应收款金额 */ /** 应收款金额 */
private BigDecimal receivableAmount; private BigDecimal receivableAmount;
@ -59,7 +59,7 @@ public class Receivable extends BaseEntity {
private LocalDateTime confirmTime; private LocalDateTime confirmTime;
/** 确认人ID */ /** 确认人ID */
private Long confirmBy; private String confirmBy;
/** 备注 */ /** 备注 */
private String remark; private String remark;
@ -72,27 +72,27 @@ public class Receivable extends BaseEntity {
this.receivableCode = receivableCode; this.receivableCode = receivableCode;
} }
public Long getRequirementId() { public String getRequirementId() {
return requirementId; return requirementId;
} }
public void setRequirementId(Long requirementId) { public void setRequirementId(String requirementId) {
this.requirementId = requirementId; this.requirementId = requirementId;
} }
public Long getProjectId() { public String getProjectId() {
return projectId; return projectId;
} }
public void setProjectId(Long projectId) { public void setProjectId(String projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
public Long getCustomerId() { public String getCustomerId() {
return customerId; return customerId;
} }
public void setCustomerId(Long customerId) { public void setCustomerId(String customerId) {
this.customerId = customerId; this.customerId = customerId;
} }
@ -184,11 +184,11 @@ public class Receivable extends BaseEntity {
this.confirmTime = confirmTime; this.confirmTime = confirmTime;
} }
public Long getConfirmBy() { public String getConfirmBy() {
return confirmBy; return confirmBy;
} }
public void setConfirmBy(Long confirmBy) { public void setConfirmBy(String confirmBy) {
this.confirmBy = confirmBy; this.confirmBy = confirmBy;
} }

18
fund-receipt/src/main/java/com/fundplatform/receipt/dto/FundReceiptDTO.java
View File

@ -8,7 +8,7 @@ import java.time.LocalDateTime;
public class FundReceiptDTO { public class FundReceiptDTO {
private Long id; private String id;
@NotBlank(message = "收款标题不能为空") @NotBlank(message = "收款标题不能为空")
private String title; private String title;
@ -29,15 +29,15 @@ public class FundReceiptDTO {
private String payerAccount; private String payerAccount;
private LocalDateTime receiptDate; private LocalDateTime receiptDate;
private String purpose; private String purpose;
private Long projectId; private String projectId;
private Long customerId; private String customerId;
private String invoiceNo; private String invoiceNo;
private String voucher; private String voucher;
private String attachments; private String attachments;
private String remark; private String remark;
public Long getId() { return id; } public String getId() { return id; }
public void setId(Long id) { this.id = id; } public void setId(String id) { this.id = id; }
public String getTitle() { return title; } public String getTitle() { return title; }
public void setTitle(String title) { this.title = title; } public void setTitle(String title) { this.title = title; }
public BigDecimal getAmount() { return amount; } public BigDecimal getAmount() { return amount; }
@ -56,10 +56,10 @@ public class FundReceiptDTO {
public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; } public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; }
public String getPurpose() { return purpose; } public String getPurpose() { return purpose; }
public void setPurpose(String purpose) { this.purpose = purpose; } public void setPurpose(String purpose) { this.purpose = purpose; }
public Long getProjectId() { return projectId; } public String getProjectId() { return projectId; }
public void setProjectId(Long projectId) { this.projectId = projectId; } public void setProjectId(String projectId) { this.projectId = projectId; }
public Long getCustomerId() { return customerId; } public String getCustomerId() { return customerId; }
public void setCustomerId(Long customerId) { this.customerId = customerId; } public void setCustomerId(String customerId) { this.customerId = customerId; }
public String getInvoiceNo() { return invoiceNo; } public String getInvoiceNo() { return invoiceNo; }
public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; } public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; }
public String getVoucher() { return voucher; } public String getVoucher() { return voucher; }

24
fund-receipt/src/main/java/com/fundplatform/receipt/dto/ReceivableDTO.java
View File

@ -12,15 +12,15 @@ import java.time.LocalDate;
*/ */
public class ReceivableDTO { public class ReceivableDTO {
private Long id; private String id;
private Long requirementId; private String requirementId;
@NotNull(message = "项目ID不能为空") @NotNull(message = "项目ID不能为空")
private Long projectId; private String projectId;
@NotNull(message = "客户ID不能为空") @NotNull(message = "客户ID不能为空")
private Long customerId; private String customerId;
@NotNull(message = "应收款金额不能为空") @NotNull(message = "应收款金额不能为空")
@Positive(message = "应收款金额必须大于0") @Positive(message = "应收款金额必须大于0")
@ -37,35 +37,35 @@ public class ReceivableDTO {
private String remark; private String remark;
public Long getId() { public String getId() {
return id; return id;
} }
public void setId(Long id) { public void setId(String id) {
this.id = id; this.id = id;
} }
public Long getRequirementId() { public String getRequirementId() {
return requirementId; return requirementId;
} }
public void setRequirementId(Long requirementId) { public void setRequirementId(String requirementId) {
this.requirementId = requirementId; this.requirementId = requirementId;
} }
public Long getProjectId() { public String getProjectId() {
return projectId; return projectId;
} }
public void setProjectId(Long projectId) { public void setProjectId(String projectId) {
this.projectId = projectId; this.projectId = projectId;
} }
public Long getCustomerId() { public String getCustomerId() {
return customerId; return customerId;
} }
public void setCustomerId(Long customerId) { public void setCustomerId(String customerId) {
this.customerId = customerId; this.customerId = customerId;
} }

48
fund-receipt/src/main/java/com/fundplatform/receipt/vo/FundReceiptVO.java
View File

@ -5,7 +5,7 @@ import java.time.LocalDateTime;
public class FundReceiptVO { public class FundReceiptVO {
private Long id; private String id;
private String receiptNo; private String receiptNo;
private String title; private String title;
private BigDecimal amount; private BigDecimal amount;
@ -17,24 +17,24 @@ public class FundReceiptVO {
private String payerAccount; private String payerAccount;
private LocalDateTime receiptDate; private LocalDateTime receiptDate;
private String purpose; private String purpose;
private Long projectId; private String projectId;
private Long customerId; private String customerId;
private Long receivableId; private String receivableId;
private Integer receiptStatus; private Integer receiptStatus;
private String receiptStatusName; private String receiptStatusName;
private LocalDateTime confirmTime; private LocalDateTime confirmTime;
private Long confirmBy; private String confirmBy;
private LocalDateTime writeOffTime; private LocalDateTime writeOffTime;
private Long writeOffBy; private String writeOffBy;
private String voucher; private String voucher;
private String invoiceNo; private String invoiceNo;
private String attachments; private String attachments;
private Long tenantId; private String tenantId;
private Long createdBy; private String createdBy;
private LocalDateTime createdTime; private LocalDateTime createdTime;
public Long getId() { return id; } public String getId() { return id; }
public void setId(Long id) { this.id = id; } public void setId(String id) { this.id = id; }
public String getReceiptNo() { return receiptNo; } public String getReceiptNo() { return receiptNo; }
public void setReceiptNo(String receiptNo) { this.receiptNo = receiptNo; } public void setReceiptNo(String receiptNo) { this.receiptNo = receiptNo; }
public String getTitle() { return title; } public String getTitle() { return title; }
@ -57,34 +57,34 @@ public class FundReceiptVO {
public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; } public void setReceiptDate(LocalDateTime receiptDate) { this.receiptDate = receiptDate; }
public String getPurpose() { return purpose; } public String getPurpose() { return purpose; }
public void setPurpose(String purpose) { this.purpose = purpose; } public void setPurpose(String purpose) { this.purpose = purpose; }
public Long getProjectId() { return projectId; } public String getProjectId() { return projectId; }
public void setProjectId(Long projectId) { this.projectId = projectId; } public void setProjectId(String projectId) { this.projectId = projectId; }
public Long getCustomerId() { return customerId; } public String getCustomerId() { return customerId; }
public void setCustomerId(Long customerId) { this.customerId = customerId; } public void setCustomerId(String customerId) { this.customerId = customerId; }
public Long getReceivableId() { return receivableId; } public String getReceivableId() { return receivableId; }
public void setReceivableId(Long receivableId) { this.receivableId = receivableId; } public void setReceivableId(String receivableId) { this.receivableId = receivableId; }
public Integer getReceiptStatus() { return receiptStatus; } public Integer getReceiptStatus() { return receiptStatus; }
public void setReceiptStatus(Integer receiptStatus) { this.receiptStatus = receiptStatus; } public void setReceiptStatus(Integer receiptStatus) { this.receiptStatus = receiptStatus; }
public String getReceiptStatusName() { return receiptStatusName; } public String getReceiptStatusName() { return receiptStatusName; }
public void setReceiptStatusName(String receiptStatusName) { this.receiptStatusName = receiptStatusName; } public void setReceiptStatusName(String receiptStatusName) { this.receiptStatusName = receiptStatusName; }
public LocalDateTime getConfirmTime() { return confirmTime; } public LocalDateTime getConfirmTime() { return confirmTime; }
public void setConfirmTime(LocalDateTime confirmTime) { this.confirmTime = confirmTime; } public void setConfirmTime(LocalDateTime confirmTime) { this.confirmTime = confirmTime; }
public Long getConfirmBy() { return confirmBy; } public String getConfirmBy() { return confirmBy; }
public void setConfirmBy(Long confirmBy) { this.confirmBy = confirmBy; } public void setConfirmBy(String confirmBy) { this.confirmBy = confirmBy; }
public LocalDateTime getWriteOffTime() { return writeOffTime; } public LocalDateTime getWriteOffTime() { return writeOffTime; }
public void setWriteOffTime(LocalDateTime writeOffTime) { this.writeOffTime = writeOffTime; } public void setWriteOffTime(LocalDateTime writeOffTime) { this.writeOffTime = writeOffTime; }
public Long getWriteOffBy() { return writeOffBy; } public String getWriteOffBy() { return writeOffBy; }
public void setWriteOffBy(Long writeOffBy) { this.writeOffBy = writeOffBy; } public void setWriteOffBy(String writeOffBy) { this.writeOffBy = writeOffBy; }
public String getVoucher() { return voucher; } public String getVoucher() { return voucher; }
public void setVoucher(String voucher) { this.voucher = voucher; } public void setVoucher(String voucher) { this.voucher = voucher; }
public String getInvoiceNo() { return invoiceNo; } public String getInvoiceNo() { return invoiceNo; }
public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; } public void setInvoiceNo(String invoiceNo) { this.invoiceNo = invoiceNo; }
public String getAttachments() { return attachments; } public String getAttachments() { return attachments; }
public void setAttachments(String attachments) { this.attachments = attachments; } public void setAttachments(String attachments) { this.attachments = attachments; }
public Long getTenantId() { return tenantId; } public String getTenantId() { return tenantId; }
public void setTenantId(Long tenantId) { this.tenantId = tenantId; } public void setTenantId(String tenantId) { this.tenantId = tenantId; }
public Long getCreatedBy() { return createdBy; } public String getCreatedBy() { return createdBy; }
public void setCreatedBy(Long createdBy) { this.createdBy = createdBy; } public void setCreatedBy(String createdBy) { this.createdBy = createdBy; }
public LocalDateTime getCreatedTime() { return createdTime; } public LocalDateTime getCreatedTime() { return createdTime; }
public void setCreatedTime(LocalDateTime createdTime) { this.createdTime = createdTime; } public void setCreatedTime(LocalDateTime createdTime) { this.createdTime = createdTime; }
} }