From e02812df9217d3e50a368a8234c07c60c64c0ff4 Mon Sep 17 00:00:00 2001 From: shiyunteng <shiyunteng@example.com> Date: 星期三, 05 八月 2026 08:34:26 +0800 Subject: [PATCH] feat:新增石煤机 机械厂模版合同/客户数据主数据同步接口/合同履约进度新增质保结束操作/合同开票状态 修改为待开 可开 已开/出库逻辑完善 --- platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/vo/ContractDetailVo.java | 102 +++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 94 insertions(+), 8 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 ceb4980..d79a933 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 @@ -4,10 +4,12 @@ import com.by4cloud.platformx.business.entity.ContractSubjectMatter; 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; import java.math.BigDecimal; +import java.util.Date; import java.util.List; @Data @@ -46,7 +48,7 @@ private Integer contractType; @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬") - private Integer supplyAttribute; + private String supplyAttribute; @Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級") private Integer contractStatus; @@ -54,23 +56,23 @@ @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; @Schema(description = "浜や粯鍛ㄦ湡") private Integer deliveryCycle; - @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 effectiveDate; + private Date effectiveDate; @DateTimeFormat(pattern = "yyyy-MM-dd") @JsonFormat(pattern = "yyyy-MM-dd") @Schema(description = "鍒版湡鏃ユ湡") - private String expirationDate; + private Date expirationDate; @Schema(description = "鍚堝悓闄勪欢URL") private String attachmentUrl; @@ -153,6 +155,90 @@ @Schema(description = "鍚堝悓鎬讳环绋庣巼") private BigDecimal contractTax; + @Schema(description = "缁忔祹浜嬮」 bip鎺ㄩ�佸簲鏀剁敤") + private String economicMatters; + + private String industryCode; + + @Schema(description = "闇�鏂瑰湪鎺ュ埌閫氱煡鍚� 鏃ュ唴杩涜妫�楠�") + private BigDecimal inspectDay; + + @Schema(description = "鏀跺埌渚涙柟閫氱煡鍚� 鏃ュ唴娲句汉楠屾敹") + private BigDecimal acceptDay; + + @Schema(description = "寤堕獙鏀惰秴杩� 鏃�") + private BigDecimal delayAcceptDay; + + @Schema(description = "楠屾敹鍚堟牸鍚� 涓伐浣滄棩") + private BigDecimal acceptPassDay; + + @Schema(description = "楠屾敹鍚堟牸鍚戜緵鏂硅冻棰濇敮浠樺悎鍚屾�讳环鐨�") + private BigDecimal acceptPassAmount; + + @Schema(description = "鏃ュ唴寮�濮嬪彂璐�") + private BigDecimal deliverDay; + + @Schema(description = "鏃ュ唴鍙戝畬") + private BigDecimal deliverCompleteDay; + + @Schema(description = "渚涙柟浠ｇ悊") + private String supplierAgent; + + @Schema(description = "渚涙柟浠ｇ悊韬唤璇�") + private String supplierAgentIdCard; + + @Schema(description = "闇�鏂逛唬鐞�") + private String buyerAgent; + + @Schema(description = "闇�鏂逛唬鐞嗚韩浠借瘉") + private String buyerAgentIdCard; + + private String agentAuthority; + + @Schema(description = "寤舵湡鏀粯棰勪粯娆�") + private BigDecimal delayPayAdvancePayment; + + @Schema(description = "寤舵湡鏀粯杩涘害娆�") + private BigDecimal delayPayProcessPayment; + + @Schema(description = "鏀跺埌棰勪粯娆句箣鏃ヨ捣 涓湀鍐呮湭鐢熶骇瀹屾垚") + private BigDecimal receiveAdvancePaymentMonth; + + @Schema(description = "骞舵彁鍓� 鍚勫伐浣滄棩閫氱煡闇�鏂归獙鏀�") + private BigDecimal noticeSupplierAcceptDay; + + @Schema(description = "姣忛�炬湡 鏃�") + private BigDecimal overdueDay; + + @Schema(description = "鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�") + private BigDecimal lossAmount; + + @Schema(description = "杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�") + private BigDecimal liquidatedDamagesHighSupplier; + + @Schema(description = "闇�鏂瑰閫炬湡浠樻姣忛�炬湡 鏃�") + private BigDecimal overdueDayXf; + + @Schema(description = "闇�鏂瑰閫炬湡浠樻鎸夊悎鍚屾�讳环鐨� 鍋夸粯闇�鏂规崯澶�") + private BigDecimal lossAmountXf; + + @Schema(description = "杩濈害閲戞渶楂樹笉瓒呰繃鍚堝悓鎬讳环鐨�") + private BigDecimal liquidatedDamagesHighBuyer; + + @Schema(description = "鏈悎鍚屼竴寮� 浠�") + private BigDecimal totalParts; + + @Schema(description = "渚涙柟鎵� 浠�") + private BigDecimal supplierPart; + + @Schema(description = "闇�鏂规墽 浠�") + private BigDecimal buyerPart; + + @Schema(description = "浠樻鏂瑰紡") + private String paymentMethod; + + private BigDecimal advancePayment; + private List<ContractPaymentSchedule> contractPaymentSchedule; private List<ContractSubjectMatter> contractSubjectMatter; -- Gitblit v1.9.1