2025/platformx-business-finance.git

			@@ -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;