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 | 183 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 173 insertions(+), 10 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 72682e9..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 @@ -1,14 +1,15 @@ package com.by4cloud.platformx.business.vo; -import com.by4cloud.platformx.business.dto.ContractPaymentScheduleAddDTO; -import com.by4cloud.platformx.business.dto.ContractSubjectMatterAddDTO; import com.by4cloud.platformx.business.entity.ContractPaymentSchedule; 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 @@ -19,11 +20,17 @@ @Schema(description = "鍚堝悓鍚嶇О") private String contractName; + @Schema(description = "鍚堝悓鍚嶇О") + private String contractNo; + @Schema(description = "鐢叉柟id") private Long partyAId; @Schema(description = "鐢叉柟鍚嶇О") private String partyA; + + @Schema(description = "鐢叉柟绋庡彿") + private String partyAOrgCode; @Schema(description = "涔欐柟id") private Long partyBId; @@ -41,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; @@ -49,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; @@ -76,6 +83,162 @@ @Schema(description = "妯＄増ID") private Long templateId; + @Schema(description = "鍚堝悓鍒嗙被") + private String contractCategory; + + @Schema(description = "绛捐鍦扮偣") + private String signPlace; + + @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; + + @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