From e7e6d39b095b6a763e54ab34631171c3de32ec9e Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期五, 15 五月 2026 08:33:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 97 +++++++++++++++++++++++++++++++++++++-----------
1 files changed, 74 insertions(+), 23 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 3b77c3a..dbd114c 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
@@ -2,26 +2,31 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.by4cloud.platformx.common.data.mybatis.BaseModel;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.persistence.Column;
import jakarta.persistence.Entity;
+import jakarta.persistence.Table;
+import jakarta.persistence.Transient;
import lombok.Data;
-import org.hibernate.annotations.Table;
-
-import javax.persistence.Transient;
-import java.math.BigDecimal;
-
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
-import com.fasterxml.jackson.annotation.JsonFormat;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.List;
/**
* @author cd
- * @description
+ * @description 鍚堝悓绠＄悊
* @date 2026/4/29 10:51
**/
@Data
@Entity
-@Table(appliesTo = "contract", comment = "鍚堝悓绠＄悊")
+@Table(name = "contract")
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
public class Contract extends BaseModel<Contract> {
@@ -34,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 = "VARCHAR(100) comment '涔欐柟id'")
- private String partyBId;
+ @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 '甯佺'")
@@ -60,6 +65,10 @@
@Schema(description = "鍚堝悓绫诲瀷锛�0-鐢熸垚寮� 1-澶囨寮忥級")
@Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓绫诲瀷'")
private Integer contractType;
+
+ @Schema(description = "渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬")
+ @Column(columnDefinition = "tinyint(2) default 0 comment '渚涘簲灞炴�� 0-鎴愬搧 1-澶囦欢 2-澶т慨 3-鍏朵粬'")
+ private Integer supplyAttribute;
@Schema(description = "鍚堝悓鐘舵�侊紙0-鑽夌 1-宸茬敓鏁� 2-宸茬粓姝� 3-宸茶繃鏈燂級")
@Column(columnDefinition = "tinyint(2) default 0 comment '鍚堝悓鐘舵��'")
@@ -72,20 +81,24 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@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(64) comment '鐢熸晥鏃ユ湡'")
- private String effectiveDate;
+ @Column(columnDefinition = "date comment '鐢熸晥鏃ユ湡'")
+ private Date effectiveDate;
+
+ @Schema(description = "浜や粯鍛ㄦ湡")
+ @Column(columnDefinition = "int default 0 comment '浜や粯鍛ㄦ湡'")
+ private Integer deliveryCycle;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@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'")
@@ -104,7 +117,31 @@
@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;
/**
* 涓存椂瀛楁 - 鐢ㄤ簬鎺ユ敹瀹℃壒浜哄悕绉扮瓑鍏宠仈鏌ヨ缁撴灉
@@ -112,12 +149,26 @@
@Transient
@TableField(exist = false)
private String approverName;
+ /**
+ * 鏍囩殑鐗�
+ */
+ @Transient
+ @TableField(exist = false)
+ private List<ContractSubjectMatter> contractSubjectMatterList;
+
+
+ /**
+ * 鏀舵闃舵
+ */
+ @Transient
+ @TableField(exist = false)
+ private List<ContractPaymentSchedule> contractPaymentScheduleList;
/**
* 涓存椂瀛楁 - 鍚堝悓鍓╀綑澶╂暟
*/
@Transient
@TableField(exist = false)
- @Schema(description = "鍚堝悓鍓╀綑澶╂暟锛堜复鏃跺瓧娈碉級")
private Long remainingDays;
+
}
--
Gitblit v1.9.1