From d36a5483f0287028bf65cfcd69b88543070e7e98 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期四, 28 五月 2026 14:44:27 +0800
Subject: [PATCH] feat:新增房屋租赁/水电代缴合同新增功能 新增逾期出库功能 新增水电代缴合同抄表功能
---
platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java | 99 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 71 insertions(+), 28 deletions(-)
diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
index a9ef21c..2347d87 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/entity/ContractSubjectMatter.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;
@@ -21,8 +23,18 @@
*/
@Data
@Entity
-@Table(appliesTo = "contract_subject_matter", comment = "鍚堝悓鏍囩殑鐗╂槑缁嗚〃")
+@Table(name = "contract_subject_matter")
+@ToString(callSuper = true)
+@EqualsAndHashCode(callSuper = true)
public class ContractSubjectMatter extends BaseModel<ContractSubjectMatter> {
+
+ @Schema(description = "鎺掍骇璁″垝ID")
+ @Column(columnDefinition = "bigint comment '鎺掍骇璁″垝ID'")
+ private Long productionPlanId;
+
+ @Schema(description = "鎺掍骇璁″垝鍚嶇О")
+ @Column(columnDefinition = "VARCHAR(200) comment '鎺掍骇璁″垝鍚嶇О'")
+ private String productionPlanName;
@Schema(description = "鍏宠仈鍚堝悓ID")
@Column(columnDefinition = "bigint comment '鍏宠仈鍚堝悓ID'")
@@ -57,32 +69,32 @@
private Integer category;
@Schema(description = "鏁伴噺")
- @Column(columnDefinition = "double comment '鏁伴噺'")
- private Double quantity;
+ @Column(columnDefinition = "decimal(10,2) comment '鏁伴噺'")
+ private BigDecimal quantity;
@Schema(description = "璁￠噺鍗曚綅锛堜釜/鍙�/鍚�/椤�/濂楃瓑锛�")
@Column(columnDefinition = "VARCHAR(20) comment '璁￠噺鍗曚綅'")
private String unit;
@Schema(description = "鍗曚环")
- @Column(columnDefinition = "double comment '鍗曚环'")
- private Double unitPrice;
+ @Column(columnDefinition = "decimal(10,2) comment '鍗曚环'")
+ private BigDecimal unitPrice;
@Schema(description = "绋庣巼锛堢櫨鍒嗘瘮锛屽13琛ㄧず13%锛�")
- @Column(columnDefinition = "double default 0.00 comment '绋庣巼'")
- private Double taxRate;
+ @Column(columnDefinition = "decimal(10,2) comment '绋庣巼'")
+ private BigDecimal taxRate;
@Schema(description = "绋庨")
- @Column(columnDefinition = "double default 0.00 comment '绋庨'")
- private Double taxAmount;
+ @Column(columnDefinition = "decimal(10,2) comment '绋庨'")
+ private BigDecimal taxAmount;
@Schema(description = "鍚◣鎬讳环")
- @Column(columnDefinition = "double comment '鍚◣鎬讳环'")
- private Double totalAmount;
+ @Column(columnDefinition = "decimal(10,2) comment '鍚◣鎬讳环'")
+ private BigDecimal totalAmount;
@Schema(description = "涓嶅惈绋庢�讳环")
- @Column(columnDefinition = "double comment '涓嶅惈绋庢�讳环'")
- private Double totalAmountExcludingTax;
+ @Column(columnDefinition = "decimal(10,2) comment '涓嶅惈绋庢�讳环'")
+ private BigDecimal totalAmountExcludingTax;
@Schema(description = "浜よ揣/浜や粯鍦扮偣")
@Column(columnDefinition = "VARCHAR(500) comment '浜よ揣/浜や粯鍦扮偣'")
@@ -91,16 +103,16 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "璁″垝浜や粯鏃ユ湡")
- @Column(columnDefinition = "datetime comment '璁″垝浜や粯鏃ユ湡'")
- private Date plannedDeliveryDate;
+ @Column(columnDefinition = "VARCHAR(64) comment '璁″垝浜や粯鏃ユ湡'")
+ private String plannedDeliveryDate;
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "瀹為檯浜や粯鏃ユ湡")
- @Column(columnDefinition = "datetime comment '瀹為檯浜や粯鏃ユ湡'")
- private Date actualDeliveryDate;
+ @Column(columnDefinition = "VARCHAR(64) comment '瀹為檯浜や粯鏃ユ湡'")
+ private String actualDeliveryDate;
- @Schema(description = "浜や粯鐘舵�侊紙0-鏈氦浠� 1-閮ㄥ垎浜や粯 2-宸蹭氦浠� 3-閫炬湡锛�")
+ @Schema(description = "浜や粯鐘舵�侊紙0-鏈氦浠� 1-閮ㄥ垎浜や粯 2-宸蹭氦浠橈級")
@Column(columnDefinition = "tinyint(2) default 0 comment '浜や粯鐘舵��'")
private Integer deliveryStatus;
@@ -127,15 +139,46 @@
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
@Schema(description = "楠屾敹鏃堕棿")
- @Column(columnDefinition = "datetime comment '楠屾敹鏃堕棿'")
- private Date acceptTime;
+ @Column(columnDefinition = "VARCHAR(64) comment '楠屾敹鏃堕棿'")
+ private String acceptTime;
+ @Schema(description = "宸蹭氦浠樻暟閲�")
+ @Column(columnDefinition = "decimal(10,2) comment '宸蹭氦浠樻暟閲�'")
+ private BigDecimal deliveredQuantity;
- /**
- * 涓存椂瀛楁 - 宸蹭氦浠樻暟閲忥紙鐢ㄤ簬浜や粯杩涘害缁熻锛�
- */
- @Transient
- @TableField(exist = false)
- @Schema(description = "宸蹭氦浠樻暟閲忥紙涓存椂瀛楁锛�")
- private BigDecimal deliveredQuantity;
+ @Schema(description = "鏈氦浠樻暟閲�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈氦浠樻暟閲�'")
+ private BigDecimal remainingQuantity;
+
+ @Schema(description = "鎶樻墸鐜�")
+ @Column(columnDefinition = "decimal(10,2) comment '鎶樻墸鐜�'")
+ private BigDecimal discountRate;
+
+ @Schema(description = "鏈�杩戜竴娆′氦浠樻暟閲�")
+ @Column(columnDefinition = "decimal(10,2) comment '鏈�杩戜竴娆′氦浠樻暟閲�'")
+ private BigDecimal lastDeliveredQuantity;
+
+ @Schema(description = "鎶勮〃缂栧彿")
+ @Column(columnDefinition="VARCHAR(64) comment '鎶勮〃琛ㄥ彿'")
+ private String meterReadCode;
+
+ @Schema(description = "鎶勮〃鏁板瓧")
+ @Column(columnDefinition="decimal(10,0) comment '鎶勮〃鏁板瓧'")
+ private BigDecimal meterReadNum;
+
+ @Schema(description = "鎶勮〃鍗曟嵁鍚嶇О")
+ @Column(columnDefinition="text comment '鍗曟嵁鍚嶇О'")
+ private String meterReadAttNames;
+
+ @Schema(description = "鎶勮〃鍗曟嵁璺緞")
+ @Column(columnDefinition="text comment '鍗曟嵁璺緞'")
+ private String meterReadAttPaths;
+
+ @Schema(description = "鍗曢噸")
+ @Column(columnDefinition = "decimal(10,2) comment '鍗曢噸 /kg'")
+ private BigDecimal singleWight;
+
+ @Schema(description = "鎬婚噸")
+ @Column(columnDefinition = "decimal(10,2) comment '鎬婚噸 /kg'")
+ private BigDecimal totalWight;
}
\ No newline at end of file
--
Gitblit v1.9.1