From 0527f90adf2aea086af681fb8f3dbf49c0a5ed31 Mon Sep 17 00:00:00 2001
From: shiyunteng <shiyunteng@example.com>
Date: 星期三, 27 五月 2026 17:21:27 +0800
Subject: [PATCH] feat:新增非主营业务水电代缴/房屋租赁合同

---
 platformx-business-finance-api/src/main/java/com/by4cloud/platformx/business/dto/ContractAddDTO.java |   35 ++++++++++++++++++++++++-----------
 1 files changed, 24 insertions(+), 11 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 7a1110b..4b11d85 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
@@ -1,7 +1,6 @@
 package com.by4cloud.platformx.business.dto;
 
-import com.by4cloud.platformx.business.entity.ContractPaymentSchedule;
-import com.by4cloud.platformx.business.entity.ContractSubjectMatter;
+
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -10,6 +9,7 @@
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.util.Date;
 import java.util.List;
 
 @Data
@@ -50,18 +50,16 @@
 	@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 Integer deliveryCycle;
 
-	@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 expirationDate;
 
@@ -71,6 +69,21 @@
 	@Schema(description = "澶囨敞")
 	private String remark;
 
+	@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