From efaba8b3b77ac7bee6a3c39f85caa676e6b71d33 Mon Sep 17 00:00:00 2001
From: 李白 <7387820+wjli_13439841639@user.noreply.gitee.com>
Date: 星期四, 14 五月 2026 10:36:57 +0800
Subject: [PATCH] 开会后对客商排产计划，销售人员的整体修改
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractPaymentSchedule.java | 46 +++++++++++++++++++++++++++++++---------------
1 files changed, 31 insertions(+), 15 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 04ff428..2f80b76 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
@@ -6,9 +6,11 @@
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 lombok.EqualsAndHashCode;
+import lombok.ToString;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -23,7 +25,9 @@
*/
@Data
@Entity
-@Table(appliesTo = "contract_payment_schedule", comment = "鍚堝悓鏀舵璁″垝/灞ョ害鑺傜偣琛�")
+@Table(name = "contract_payment_schedule")
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
public class ContractPaymentSchedule extends BaseModel<ContractPaymentSchedule> {
// ==================== 鍏宠仈淇℃伅 ====================
@@ -69,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(10,2) comment '璁″垝鏀舵閲戦'")
+ private BigDecimal plannedAmount;
@Schema(description = "瀹為檯鏀舵閲戦")
- @Column(columnDefinition = "double default 0.00 comment '瀹為檯鏀舵閲戦'")
- private Double actualAmount;
+ @Column(columnDefinition = "decimal(10,2) comment '瀹為檯鏀舵閲戦'")
+ private BigDecimal actualAmount;
// ==================== 鏃跺簭鎺у埗 ====================
@@ -86,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 = "鏀舵鏃ユ湡")
+ @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 '绾﹀畾澶╂暟'")
--
Gitblit v1.9.1