From 6bbed1ea6b36af4eb0b234bec9d6e42d56f0cd00 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期三, 30 九月 2026 16:12:49 +0800 Subject: [PATCH] feat:合同新增关联单位 开票可根据甲方或关联单位选择开票单位 收款去掉强制确认 收款只关联合同甲方或关联单位 --- platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 37 +++++++++++++++++++++++++++++++++---- 1 files changed, 33 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 1492a17..b71633c 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; @@ -242,7 +240,38 @@ private BigDecimal advancePayment; + @Schema(description = "绠�鏄撳悎鍚岄檮浠禪RL") + private String attachmentSimpleUrl; + + @Schema(description = "绠�鏄撳悎鍚岄檮浠跺悕绉�") + private String attachmentSimpleName; + + @Schema(description = "寮�绁ㄧ被鍨�") + private String invoiceType; + + private BigDecimal paidAmount; + + @Schema(description = "閫夊晢鏂瑰紡") + private String selectionMethod; + + @Schema(description = "鏄惁鍏宠仈浜ゆ槗") + private String isRelated; + + @Schema(description = "涔欐柟id") + private Long partyCId; + + @Schema(description = "鏉℃涓昏鍐呭") + private String summary; + + 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