2025/platformx-business-finance.git

			@@ -13,6 +13,8 @@
			import lombok.ToString;
			import org.springframework.format.annotation.DateTimeFormat;

			import java.math.BigDecimal;
			import java.util.Date;
			import java.util.List;

			/**
			@@ -53,8 +55,8 @@
			private String partyB;

			@Schema(description = "合同金额")
			@Column(columnDefinition = "double comment '合同金额'")
			private Double amount;
			@Column(columnDefinition = "decimal(10,2) comment '合同金额'")
			private BigDecimal amount;

			@Schema(description = "币种（CNY/USD等）")
			@Column(columnDefinition = "VARCHAR(10) default 'CNY' comment '币种'")
			@@ -76,23 +78,31 @@
			@Column(columnDefinition = "tinyint(2) default 0 comment '合同服务属性'")
			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 = "签署日期")
			@Column(columnDefinition = "VARCHAR(64) comment '签署日期'")
			private String signDate;
			@Column(columnDefinition = "date comment '签署日期'")
			private Date signDate;

			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
			@Schema(description = "签订地点")
			@Column(columnDefinition = "VARCHAR(255) comment '签订地点'")
			private String signPlace;

			@DateTimeFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@Schema(description = "生效日期")
			@Column(columnDefinition = "VARCHAR(64) comment '生效日期'")
			private String effectiveDate;
			@Column(columnDefinition = "date comment '生效日期'")
			private Date effectiveDate;

			@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
			@Schema(description = "交付周期")
			@Column(columnDefinition = "int default 0 comment '交付周期'")
			private Integer deliveryCycle;

			@DateTimeFormat(pattern = "yyyy-MM-dd")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@Schema(description = "到期日期")
			@Column(columnDefinition = "VARCHAR(64) comment '到期日期'")
			private String expirationDate;
			@Column(columnDefinition = "date comment '到期日期'")
			private Date expirationDate;

			@Schema(description = "合同附件URL")
			@Column(columnDefinition = "VARCHAR(500) comment '合同附件URL'")
			@@ -111,9 +121,133 @@
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
			@Schema(description = "审批时间")
			@Column(columnDefinition = "datetime comment '审批时间'")
			private String approveTime;
			private Date approveTime;

			/**
			@Schema(description = "到货节点ID")
			@Column(columnDefinition = "bigint comment '到货节点ID'")
			private Long arrivalScheduleId;

			@Schema(description = "验收节点ID")
			@Column(columnDefinition = "bigint comment '验收节点ID'")
			private Long acceptScheduleId;

			@Schema(description = "erp推送标识")
			@Column(columnDefinition = "char comment 'erp推送标识 0 未推 1 已推'")
			private String erpPushFlag;

			@Schema(description = "开票状态")
			@Column(columnDefinition = "char comment '开票状态 0 不能开票 1 部分可开 2 待开 3 已开'")
			private String billingStatus;

			@Schema(description = "已开票金额")
			@Column(columnDefinition = "decimal(10,2) comment '已开票金额'")
			private BigDecimal billingAmout;

			@Schema(description = "下一阶段")
			@Column(columnDefinition = "VARCHAR(128) comment '下一阶段'")
			private String nextScheduleName;

			@Schema(description = "模版ID")
			@Column(columnDefinition = "bigint comment '模版ID'")
			private Long templateId;

			@Schema(description = "销售模式")
			@Column(columnDefinition = "VARCHAR(16) comment '销售模式 1 按单生产 2 先产后销 3 代储代销'")
			private String salesModel;

			@Schema(description = "已付款金额")
			@Column(columnDefinition = "decimal(10,2) comment '已付款金额'")
			private BigDecimal paidAmount;

			@Schema(description = "合同分类")
			@Column(columnDefinition = "VARCHAR(64) comment '合同分类 water_house 水电房屋租赁'")
			private String contractCategory;

			@Schema(description = "执行周期")
			@Column(columnDefinition = "char comment '执行周期 1/周 2/月 3/季度 4/半年 5/年'")
			private String execFrequency;

			@Schema(description = "执行次数")
			@Column(columnDefinition = "int comment '执行次数'")
			private Integer execTimes;

			@Schema(description = "执行日期后多少天生成应收")
			@Column(columnDefinition = "int comment '执行日期后多少天生成应收'")
			private Integer execDay;

			@Schema(description = "环境")
			@Column(columnDefinition = "VARCHAR(128) comment '环境一煤机采购合同用'")
			private String environment;

			@Schema(description = "标准")
			@Column(columnDefinition = "VARCHAR(128) comment '标准一煤机采购合同用'")
			private String standard;

			@Schema(description = "质保期使用月数")
			@Column(columnDefinition = "decimal(10,0) comment '质保期使用月数一煤机采购合同用'")
			private BigDecimal useMonth;

			@Schema(description = "质保期发货后月数")
			@Column(columnDefinition = "decimal(10,0) comment '质保期发货后月数一煤机采购合同用'")
			private BigDecimal afterShipMonth;

			@Schema(description = "货运方式")
			@Column(columnDefinition = "VARCHAR(128) comment '货运方式一煤机采购合同用'")
			private String shipMethod;

			@Schema(description = "货运地址")
			@Column(columnDefinition = "VARCHAR(128) comment '货运地址一煤机采购合同用'")
			private String shipAddress;

			@Schema(description = "包装")
			@Column(columnDefinition = "VARCHAR(128) comment '包装一煤机采购合同用'")
			private String packaging;

			@Schema(description = "维修或换货期限")
			@Column(columnDefinition = "decimal(10,0) comment '维修或换货期限一煤机采购合同用'")
			private BigDecimal repairPeriod;

			@Schema(description = "维修或换货违约金")
			@Column(columnDefinition = "decimal(10,2) comment '维修或换货违约金一煤机采购合同用'")
			private BigDecimal repairBreachAmount;

			@Schema(description = "货物数量不足补货天数")
			@Column(columnDefinition = "decimal(10,0) comment '货物数量不足补货天数一煤机采购合同用'")
			private BigDecimal goodsShort;

			@Schema(description = "货物数量不足违约金")
			@Column(columnDefinition = "decimal(10,2) comment '货物数量不足补货天数一煤机采购合同用'")
			private BigDecimal goodsShortBreachAmount;

			@Schema(description = "每逾期一日，承担本合同总额违约金")
			@Column(columnDefinition = "decimal(10,2) comment '每逾期一日，承担本合同总额违约金补货天数一煤机采购合同用'")
			private BigDecimal overdueBreachAmount;

			@Schema(description = "逾期日以上的，甲方有权解除合同")
			@Column(columnDefinition = "decimal(10,0) comment '逾期日以上的，甲方有权解除合同一煤机采购合同用'")
			private BigDecimal terminateContract;

			@Schema(description = "双方均可向人民法院")
			@Column(columnDefinition = "VARCHAR(128) comment '双方均可向人民法院一煤机采购合同用'")
			private String court;

			@Schema(description = "本合同附件包括：")
			@Column(columnDefinition = "VARCHAR(128) comment '本合同附件包括：一煤机采购合同用'")
			private String contractAttchment;

			@Schema(description = "合同签订市")
			@Column(columnDefinition = "VARCHAR(128) comment '合同签订市一煤机采购合同用'")
			private String city;

			@Schema(description = "合同签订区")
			@Column(columnDefinition = "VARCHAR(128) comment '合同签订区一煤机采购合同用'")
			private String region;

			@Schema(description = "开票通知在个工作日内")
			@Column(columnDefinition = "decimal(10,0) comment '开票通知在个工作日内一煤机采购合同用'")
			private BigDecimal invoiceNotice;

			/**
			* 临时字段 - 用于接收审批人名称等关联查询结果
			*/
			@Transient