From e79ac38dd895ea22280c1aec45ffb68cf934e23e Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期四, 07 五月 2026 09:38:54 +0800
Subject: [PATCH] 客商、销售员、产品、排产计划基础对象数据注解修改
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/Contract.java | 50 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 35 insertions(+), 15 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 0b27ee2..5647387 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,29 @@
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.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,19 +37,19 @@
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 = "鍚堝悓閲戦")
@@ -60,6 +63,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 '鍚堝悓鐘舵��'")
@@ -111,14 +118,27 @@
*/
@Transient
@TableField(exist = false)
- @Schema(description = "瀹℃壒浜哄鍚嶏紙涓存椂瀛楁锛�")
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