From c05ddf57634572b43869e00d426efe05d2df5077 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 10 六月 2026 08:16:23 +0800
Subject: [PATCH] feat:模版合同加备注、水电房屋租赁执行次数改为合同有效期、合同履约列表新增双方履约、开票新增拟开票数量
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 197 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 154 insertions(+), 43 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
index d0f4acb..c4de463 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java
@@ -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;
/**
@@ -37,24 +39,24 @@
private String contractName;
@Schema(description = "鐢叉柟id")
- @Column(columnDefinition = "bigint comment '鐢叉柟id'")
+ @Column(name = "party_a_id",columnDefinition = "bigint comment '鐢叉柟id'")
private Long partyAId;
@Schema(description = "鐢叉柟鍚嶇О")
- @Column(columnDefinition = "VARCHAR(100) comment '鐢叉柟鍚嶇О'")
+ @Column(name = "party_a",columnDefinition = "VARCHAR(100) comment '鐢叉柟鍚嶇О'")
private String partyA;
@Schema(description = "涔欐柟id")
- @Column(columnDefinition = "bigint comment '涔欐柟id'")
+ @Column(name = "party_b_id",columnDefinition = "bigint comment '涔欐柟id'")
private Long partyBId;
@Schema(description = "涔欐柟鍚嶇О")
- @Column(columnDefinition = "VARCHAR(100) comment '涔欐柟鍚嶇О'")
+ @Column(name = "party_b",columnDefinition = "VARCHAR(100) comment '涔欐柟鍚嶇О'")
private String partyB;
@Schema(description = "鍚堝悓閲戦")
- @Column(columnDefinition = "double comment '鍚堝悓閲戦'")
- private Double amount;
+ @Column(columnDefinition = "decimal(10,2) comment '鍚堝悓閲戦'")
+ private BigDecimal amount;
@Schema(description = "甯佺锛圕NY/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,33 +121,134 @@
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "瀹℃壒鏃堕棿")
@Column(columnDefinition = "datetime comment '瀹℃壒鏃堕棿'")
- private String approveTime;
+ private Date approveTime;
- /**
- * 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
- */
- @Transient
- @TableField(exist = false)
- private String approverName;
- /**
- * 鏍囩殑鐗�
- */
- @Transient
- @TableField(exist = false)
- private List<ContractSubjectMatter> contractSubjectMatterList;
+ @Schema(description = "鍒拌揣鑺傜偣ID")
+ @Column(columnDefinition = "bigint comment '鍒拌揣鑺傜偣ID'")
+ private Long arrivalScheduleId;
+ @Schema(description = "楠屾敹鑺傜偣ID")
+ @Column(columnDefinition = "bigint comment '楠屾敹鑺傜偣ID'")
+ private Long acceptScheduleId;
- /**
- * 鏀舵闃舵
- */
- @Transient
- @TableField(exist = false)
- private List<ContractPaymentSchedule> contractPaymentScheduleList;
+ @Schema(description = "erp鎺ㄩ�佹爣璇�")
+ @Column(columnDefinition = "char comment 'erp鎺ㄩ�佹爣璇� 0 鏈帹 1 宸叉帹'")
+ private String erpPushFlag;
- /**
- * 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟
- */
- @Transient
- @TableField(exist = false)
- private Long remainingDays;
+ @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;
+
+ @Schema(description = "鍚堝悓鎬讳环绋庣巼")
+ @Column(columnDefinition = "decimal(10,2) comment '寮�绁ㄩ�氱煡鍦� 涓伐浣滄棩鍐� 涓�鐓ゆ満閲囪喘鍚堝悓鐢�'")
+ private BigDecimal contractTax;
+
}
--
Gitblit v1.9.1