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/dto/ContractAddDTO.java |   26 +++++++++++++++++++-------
 1 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
index dc99a95..a7190d5 100644
--- a/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
+++ b/platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java
@@ -4,10 +4,12 @@
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.persistence.Column;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -48,15 +50,13 @@
 	@Schema(description = "鍚堝悓鏈嶅姟灞炴�э紙0-浜у搧閿�鍞� 1-鏃犲舰鏈嶅姟锛�")
 	private Integer contractAttribute;
 
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+	@DateTimeFormat(pattern = "yyyy-MM-dd")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@Schema(description = "绛剧讲鏃ユ湡")
-	private String signDate;
+	private Date signDate;
 
-	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm")
-	@Schema(description = "鐢熸晥鏃ユ湡")
-	private String effectiveDate;
+	@Schema(description = "澶囨敞")
+	private String signPlace;
 
 	@Schema(description = "浜や粯鍛ㄦ湡")
 	private Integer deliveryCycle;
@@ -75,6 +75,18 @@
 	@Schema(description = "妯＄増ID")
 	private Long templateId;
 
+	@Schema(description = "鍚堝悓鍒嗙被")
+	private String contractCategory;
+
+	@Schema(description = "鎵ц鍛ㄦ湡 1/鍛� 2/鏈� 3/瀛ｅ害 4/鍗婂勾 5/骞�")
+	private String execFrequency;
+
+	@Schema(description = "鎵ц娆℃暟")
+	private Integer execTimes;
+
+	@Schema(description = "鎵ц鏃ユ湡鍚庡灏戝ぉ鐢熸垚搴旀敹")
+	private Integer execDay;
+
 	private List<ContractPaymentScheduleAddDTO> contractPaymentSchedule;
 
 	private List<ContractSubjectMatterAddDTO> contractSubjectMatter;

--
Gitblit v1.9.1