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/ContractPageVo.java | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java index 522511c..88b7633 100644 --- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java +++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractPageVo.java @@ -2,7 +2,6 @@ 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; @@ -31,6 +30,9 @@ @Schema(description = "涔欐柟鍚嶇О") private String partyB; + @Schema(description = "涔欐柟id") + private Long partyCId; + @Schema(description = "鍚堝悓閲戦") private BigDecimal amount; @@ -44,7 +46,6 @@ private Integer supplyAttribute; @Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級") - @Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鐘舵��'") private Integer contractStatus; @Schema(description = "鍚堝悓鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�") @@ -73,6 +74,12 @@ @Schema(description = "鍚堝悓闄勪欢URL") private String attachmentUrl; + + @Schema(description = "鍚堝悓闄勪欢Name") + private String attachmentName; + + @Schema(description = "鍚堝悓闄勪欢URL") + private String lastAttachmentUrl; @Schema(description = "澶囨敞") private String remark; @@ -184,4 +191,18 @@ @Schema(description = "鍑哄簱閲戦") private BigDecimal outAmount; + + @Schema(description = "璐ㄤ繚鑺傜偣ID") + private Long warrantyScheduleId; + + private String centerPushFlag; + + private String beforeChange; + + private String afterChange; + + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Schema(description = "鍙樻洿鏃堕棿") + private Date changeTime; } -- Gitblit v1.9.1