From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 42 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 42 insertions(+), 0 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
index 85292b5..e476672 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.business.dto.YwContractBillDTO;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -161,6 +162,7 @@
@ExcelColumn(name="鐗╀笟绉熻祦鏉℃浠锋牸鍗曚綅")
private Integer wyFirstCircle;
+
@ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
@ExcelColumn(name="绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�")
private Integer zlPayType;
@@ -202,6 +204,16 @@
@ExcelColumn(name="鐗╀笟璐规�婚噾棰�")
private BigDecimal wyTotalFee;
+ @ApiModelProperty(value = "鍚堝悓鐘舵�侀泦鍚�")
+ @TableField(exist = false)
+ private List<Integer> statusList;
+
+ @ApiModelProperty(value = "鎴块棿涓婚敭 鏌ヨ浣跨敤")
+ @TableField(exist = false)
+ private Integer roomId;
+ @ApiModelProperty(value = "妤煎畤涓婚敭 鏌ヨ浣跨敤")
+ @TableField(exist = false)
+ private Integer buildingId;
@ApiModelProperty(value = "闄勪欢闆嗗悎")
@TableField(exist = false)
private List<Multifile> fileList;
@@ -244,6 +256,9 @@
@ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
@TableField(exist = false)
private Date queryStartTime;
+ @ApiModelProperty(value = "鍚堝悓鎬昏垂鐢�",notes = "鍚堝悓鍒濆鍖栨椂閲戦", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalFee;
@ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
@TableField(exist = false)
@@ -267,7 +282,34 @@
@ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
@TableField(exist = false)
private List<YwContractBill> addBillList;
+ @ApiModelProperty(value = "绉熻祦澶╂暟", example = "1")
+ @TableField(exist = false)
+ private Integer leaseDays;
+ @ApiModelProperty(value = "绉熻祦鍗曚环锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal leasePrice;
@ApiModelProperty(value = "褰撳墠鏀寔閫�娆句慨鏀归噾棰濈殑璐﹀崟闆嗗悎")
@TableField(exist = false)
private List<YwContractBill> canBackRentBills;
+
+ @ApiModelProperty(value = "鍚堝悓鍒涘缓璐﹀崟淇℃伅")
+ @TableField(exist = false)
+ private List<YwContractBillDTO> ywContractBillDTOList;
+
+
+ @ApiModelProperty(value = "绉熻祦璐硅处鍗�",hidden = true)
+ @TableField(exist = false)
+ private List<YwContractBillDTO> zlBillDTOList;
+ @ApiModelProperty(value = "鐗╀笟璐硅处鍗�",hidden = true)
+ @TableField(exist = false)
+ private List<YwContractBillDTO> wyBillDTOList;
+ @ApiModelProperty(value = "鐗╀笟鎶奸噾璐﹀崟",hidden = true)
+ @TableField(exist = false)
+ private YwContractBillDTO wyBillDTO;
+ @ApiModelProperty(value = "绉熻祦鎶奸噾璐﹀崟",hidden = true)
+ @TableField(exist = false)
+ private YwContractBillDTO zlBillDTO;
+
+
+
}
--
Gitblit v1.9.3