From 21dfddd6e09d32a50a636fff62a3d8a2ed362d5a Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 20 八月 2026 16:29:49 +0800
Subject: [PATCH] feat：合同标的物新增导入 银行流水强制确认 简易合同新增 发票重开 合同标的物导入
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java | 57 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 38 insertions(+), 19 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
index 614592d..c2c355c 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java
@@ -13,6 +13,9 @@
import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
+import java.math.BigDecimal;
+import java.util.Date;
+
/**
* 鍚堝悓鏀舵璁″垝/灞ョ害鑺傜偣瀹炰綋绫�
* 缁熶竴绠＄悊鍚堝悓鐨勬敹娆鹃樁娈点�佸饱绾﹁妭鐐广�佹敹娆炬瘮渚嬪強灞ョ害鏃堕棿鑺傜偣
@@ -30,19 +33,19 @@
// ==================== 鍏宠仈淇℃伅 ====================
@Schema(description = "鍏宠仈鍚堝悓ID")
- @Column(columnDefinition = "bigint not null comment '鍏宠仈鍚堝悓ID'")
+ @Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
private Long contractId;
@Schema(description = "鍚堝悓鍚嶇О")
@Column(columnDefinition = "VARCHAR(64) comment '鍚堝悓鍚嶇О'")
private String contractName;
- @Schema(description = "鍏宠仈鏍囩殑鐗㊣D锛堝彲閫夛紝濡傛灉涓虹┖鍒欓�傜敤浜庡悎鍚屾暣浣擄級")
- @Column(columnDefinition = "bigint comment '鍏宠仈鏍囩殑鐗㊣D'")
- private Long subjectMatterId;
+ @Schema(description = "鏍囩殑鐗╃紪鐮侊紙鍙�夛紝濡傛灉涓虹┖鍒欓�傜敤浜庡悎鍚屾暣浣擄級")
+ @Column(columnDefinition = "VARCHAR(64) comment '鏍囩殑鐗╃紪鐮�'")
+ private String subjectMatterCode;
@Schema(description = "鏍囩殑鐗╁悕绉�")
- @Column(columnDefinition = "VARCHAR(64) comment '鏍囩殑鐗╁悕绉�'")
+ @Column(columnDefinition = "VARCHAR(256) comment '鏍囩殑鐗╁悕绉�'")
private String subjectMatterName;
// ==================== 鏀舵闃舵/灞ョ害鑺傜偣鍩烘湰淇℃伅 ====================
@@ -70,16 +73,16 @@
// ==================== 鏀舵姣斾緥/閲戦 ====================
@Schema(description = "鏀舵姣斾緥锛�%锛屽30琛ㄧず30%锛夛紙鏄炬�ц绱狅級")
- @Column(columnDefinition = "double comment '鏀舵姣斾緥锛�%锛�'")
- private Double paymentRatio;
+ @Column(columnDefinition = "decimal(10,2) comment '鏀舵姣斾緥锛�%锛�'")
+ private BigDecimal paymentRatio;
@Schema(description = "璁″垝鏀舵閲戦锛堟牴鎹悎鍚屾�婚噾棰�*姣斾緥鑷姩璁＄畻锛�")
- @Column(columnDefinition = "double comment '璁″垝鏀舵閲戦'")
- private Double plannedAmount;
+ @Column(columnDefinition = "decimal(14,2) comment '璁″垝鏀舵閲戦'")
+ private BigDecimal plannedAmount;
@Schema(description = "瀹為檯鏀舵閲戦")
- @Column(columnDefinition = "double default 0.00 comment '瀹為檯鏀舵閲戦'")
- private Double actualAmount;
+ @Column(columnDefinition = "decimal(14,2) comment '瀹為檯鏀舵閲戦'")
+ private BigDecimal actualAmount;
// ==================== 鏃跺簭鎺у埗 ====================
@@ -87,17 +90,29 @@
@Column(columnDefinition = "int not null comment '闃舵椤哄簭'")
private Integer stageOrder;
- @Schema(description = "璁″垝鏀舵鏃ユ湡锛堝熀浜庡悎鍚岀璁㈡棩鏈�+绾﹀畾澶╂暟璁＄畻锛�")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
- @Column(columnDefinition = "VARCHAR(64) comment '璁″垝鏀舵鏃ユ湡'")
- private String plannedPaymentDate;
+// @Schema(description = "璁″垝鏀舵鏃ユ湡锛堝熀浜庡悎鍚岀璁㈡棩鏈�+绾﹀畾澶╂暟璁＄畻锛�")
+// @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+// @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+// @Column(columnDefinition = "date comment '璁″垝鏀舵鏃ユ湡'")
+// private Date plannedPaymentDate;
- @Schema(description = "鏀舵闃舵鐢熸晥鏃ユ湡锛堥殣鎬ц绱� - 灞ョ害鏃堕棿璧风偣锛屽嵆璇ヨ妭鐐瑰疄闄呰揪鎴愮殑鏃ユ湡锛�")
+ @Schema(description = "鏀舵鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Column(columnDefinition = "datetime comment '鏀舵鏃ユ湡'")
+ private Date paymentDate;
+
+ @Schema(description = "鏀舵闃舵鐢熸晥鏃ユ湡锛堜綔搴� 浠ユ埅姝㈡棩鏈熶负鍑嗭級")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
- @Column(columnDefinition = "VARCHAR(64) comment '鏀舵闃舵鐢熸晥鏃ユ湡锛堝饱绾﹁妭鐐瑰疄闄呰揪鎴愭棩鏈燂級'")
- private String effectiveDate;
+ @Column(columnDefinition = "date comment '鏀舵闃舵鐢熸晥鏃ユ湡锛堝饱绾﹁妭鐐瑰疄闄呰揪鎴愭棩鏈燂級 浣滃簾 浠ユ埅姝㈡棩鏈熶负鍑�'")
+ private Date effectiveDate;
+
+ @Schema(description = "鏀舵闃舵鎴鏃ユ湡")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+ @Column(columnDefinition = "date comment '鏀舵闃舵鎴鏃ユ湡'")
+ private Date effectiveEndDate;
@Schema(description = "绾﹀畾澶╂暟锛堝悎鍚岀璁㈠悗X澶╁唴浠樻/璐у埌鍚嶺澶╁唴浠樻绛夛級")
@Column(columnDefinition = "int default 0 comment '绾﹀畾澶╂暟'")
@@ -151,6 +166,10 @@
@Column(columnDefinition = "VARCHAR(500) comment '澶囨敞'")
private String remark;
+ @Schema(description = "寮�绁ㄦ爣璇�")
+ @Column(columnDefinition="char comment '寮�绁ㄦ爣璇� 0/鏈紑 1/宸插紑'")
+ private String invoiceFlag;
+
// @Schema(description = "鎺掑簭鍙�")
// @Column(columnDefinition = "int default 0 comment '鎺掑簭鍙�'")
// private Integer sortOrder;
--
Gitblit v1.9.1