From 6b969ca247b98e5a793e61ec5b0d89f4fccb3318 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期三, 10 六月 2026 16:25:18 +0800 Subject: [PATCH] feat:抵抹账条件新增付款金额小于开票金额，红票审核拒绝后蓝票可重新开红票 --- platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java | 88 ++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 81 insertions(+), 7 deletions(-) diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java index dc99a95..43515c8 100644 --- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java +++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java @@ -4,10 +4,12 @@ import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.persistence.Column; import lombok.Data; import org.springframework.format.annotation.DateTimeFormat; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @Data @@ -48,18 +50,21 @@ @Schema(description = "鍚堝悓鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�") private Integer contractAttribute; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm") + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") @Schema(description = "绛剧讲鏃ユ湡") - private String signDate; + private Date signDate; - @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm") - @Schema(description = "鐢熸晥鏃ユ湡") - private String effectiveDate; + @Schema(description = "澶囨敞") + private String signPlace; @Schema(description = "浜や粯鍛ㄦ湡") private Integer deliveryCycle; + + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + @Schema(description = "鐢熸晥鏃ユ湡") + private String effectiveDate; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @@ -75,6 +80,75 @@ @Schema(description = "妯＄増ID") private Long templateId; + @Schema(description = "鍚堝悓鍒嗙被") + private String contractCategory; + + @Schema(description = "鎵ц鍛ㄦ湡 1/鍛� 2/鏈� 3/瀛ｅ害 4/鍗婂勾 5/骞�") + private String execFrequency; + +// @Schema(description = "鎵ц娆℃暟") +// private Integer execTimes; + + @Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹") + private Integer execDay; + + @Schema(description = "鐜") + private String environment; + + @Schema(description = "鏍囧噯") + private String standard; + + @Schema(description = "璐ㄤ繚鏈� 浣跨敤鏈堟暟") + private BigDecimal useMonth; + + @Schema(description = "璐ㄤ繚鏈� 鍙戣揣鍚庢湀鏁�") + private BigDecimal afterShipMonth; + + @Schema(description = "璐ц繍鏂瑰紡") + private String shipMethod; + + @Schema(description = "璐ц繍鍦板潃") + private String shipAddress; + + @Schema(description = "鍖呰") + private String packaging; + + @Schema(description = "缁翠慨鎴栨崲璐ф湡闄�") + private BigDecimal repairPeriod; + + @Schema(description = "缁翠慨鎴栨崲璐� 杩濈害閲�") + private BigDecimal repairBreachAmount; + + @Schema(description = "璐х墿鏁伴噺涓嶈冻 琛ヨ揣澶╂暟") + private BigDecimal goodsShort; + + @Schema(description = "璐х墿鏁伴噺涓嶈冻 杩濈害閲�") + private BigDecimal goodsShortBreachAmount; + + @Schema(description = "姣忛�炬湡涓�鏃ワ紝鎵挎媴鏈悎鍚屾�婚 杩濈害閲�") + private BigDecimal overdueBreachAmount; + + @Schema(description = "閫炬湡 鏃ヤ互涓婄殑锛岀敳鏂规湁鏉冭В闄ゅ悎鍚�") + private BigDecimal terminateContract; + + @Schema(description = "鍙屾柟鍧囧彲鍚� 浜烘皯娉曢櫌") + private String court; + + @Schema(description = "鏈悎鍚岄檮浠跺寘鎷細") + private String contractAttchment; + + @Schema(description = "鍚堝悓绛捐甯�") + private String city; + + @Schema(description = "鍚堝悓绛捐鍖�") + private String region; + + @Schema(description = "寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐�") + private BigDecimal invoiceNotice; + + @Schema(description = "鍚堝悓鎬讳环绋庣巼") + private BigDecimal contractTax; + private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule; private List<ContractSubjectMatterAddDTO> contractSubjectMatter; -- Gitblit v1.9.1