From c631edf462f4ab19403f5194dec743168e2a0e79 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期一, 07 九月 2026 14:22:10 +0800 Subject: [PATCH] feat:合并开票 --- platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 28 ++++++++++++++++++++++++---- 1 files changed, 24 insertions(+), 4 deletions(-) diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java index d79a933..45dbc4b 100644 --- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java +++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java @@ -1,10 +1,8 @@ package com.by4cloud.platformx.business.vo; -import com.by4cloud.platformx.business.entity.ContractPaymentSchedule; -import com.by4cloud.platformx.business.entity.ContractSubjectMatter; +import com.by4cloud.platformx.business.entity.*; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.persistence.Column; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; @@ -39,7 +37,7 @@ private String partyB; @Schema(description = "鍚堝悓閲戦") - private Double amount; + private BigDecimal amount; @Schema(description = "甯佺锛圕NY/USD绛夛級") private String currency; @@ -76,6 +74,9 @@ @Schema(description = "鍚堝悓闄勪欢URL") private String attachmentUrl; + + @Schema(description = "鍚堝悓闄勪欢鍚嶇О") + private String attachmentName; @Schema(description = "澶囨敞") private String remark; @@ -239,7 +240,26 @@ private BigDecimal advancePayment; + @Schema(description = "绠�鏄撳悎鍚岄檮浠禪RL") + private String attachmentSimpleUrl; + + @Schema(description = "绠�鏄撳悎鍚岄檮浠跺悕绉�") + private String attachmentSimpleName; + + @Schema(description = "寮�绁ㄧ被鍨�") + private String invoiceType; + + private BigDecimal paidAmount; + + private ContractInvoiceBipVo bipVo; + private List<ContractPaymentSchedule> contractPaymentSchedule; private List<ContractSubjectMatter> contractSubjectMatter; + + private List<ContractOutBound> contractOutBound; + + private List<PaymentSlip> paymentSlip; + + private List<ContractInvoice> contractInvoice; } -- Gitblit v1.9.1