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/YwContractBill.java | 120 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 103 insertions(+), 17 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index fb775be..dadcb8f 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -12,6 +12,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import com.fasterxml.jackson.annotation.JsonFormat;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.util.Date;
import java.math.BigDecimal;
import java.util.List;
@@ -49,9 +51,10 @@
private String remark;
@ApiModelProperty(value = "璐﹀崟鍚嶇О")
private String title;
-
- @ApiModelProperty(value = "绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃ 2绉熻祦鎶奸噾 3鐗╀笟鎶奸噾 4鑷缓璐﹀崟", example = "1")
- @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鍚堝悓璐﹀崟;2=鍚堝悓璐﹀崟;3=鍚堝悓璐﹀崟;4=鑷缓璐﹀崟;")
+ @ApiModelProperty(value = "璐﹀崟缂栧彿")
+ private String code;
+ @ApiModelProperty(value = "绫诲瀷 0鍚堝悓璐﹀崟 1鑷缓璐﹀崟 2閫�娆捐处鍗�", example = "1")
+ @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鑷缓璐﹀崟;2=閫�娆捐处鍗�")
private Integer type;
@ApiModelProperty(value = "鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�", example = "1")
@@ -59,20 +62,21 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="璁¤垂寮�濮嬫棩鏈�",index = 10,width = 6,dateFormat = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
+
@ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd")
@ExcelColumn(name="璁¤垂缁撴潫鏃ユ湡",index = 11,width = 6,dateFormat = "yyyy-MM-dd")
private Date endDate;
-
@ApiModelProperty(value = "瀹為檯浠樻鏃�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date actPayDate;
@ApiModelProperty(value = "璁″垝浠樻鏃�")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
private Date planPayDate;
-
@ApiModelProperty(value = "鍚堝悓鏉℃缂栫爜锛堝叧鑱攜w_contract_detail)", example = "1")
private Integer detailId;
@@ -91,13 +95,16 @@
@ExcelColumn(name="搴旀敹閲戦",index = 5,width = 6)
private BigDecimal receivableFee;
- @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=鎶奸噾锛�3=淇濊瘉閲戯紱4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬", example = "1")
- @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐�;1=鐗╀笟璐�;2=鎶奸噾;3=淇濊瘉閲�;4=姘寸數璐�;5=鏉傞」璐�;6=鍏朵粬;")
+ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾锛�4=姘寸數璐癸紱5=鏉傞」璐癸紱6=鍏朵粬; 7=淇濊瘉閲�", example = "1")
+ @ExcelColumn(name="璐圭敤绫诲瀷",index = 8,width = 6,valueMapping = "0=绉熻祦璐癸紱1=鐗╀笟璐癸紱2=绉熻祦鎶奸噾锛�3=鐗╀笟鎶奸噾;4=姘寸數璐�;5=鏉傞」璐癸紱6=鍏朵粬;7=淇濊瘉閲�;")
private Integer costType;
@ApiModelProperty(value = "璐﹀崟绫诲瀷锛�0=鏀舵锛�1=浠樻", example = "1")
private Integer billType;
+ @ApiModelProperty(value = "璐圭敤绫诲瀷锛�0=鍛ㄦ湡璐圭敤锛�1=涓�娆℃�ц垂鐢�")
+ @TableField(exist = false)
+ private Integer feeType;
@ApiModelProperty(value = "鎵�灞炲叕鍙�", example = "1")
private Integer companyId;
@@ -105,35 +112,91 @@
@ExcelColumn(name="缁撴竻鐘舵��",index = 3,width = 6,valueMapping = "0=寰呮敹娆�;1=宸茬粨娓�;2=閮ㄥ垎缁撴竻;3=寰呬粯娆�;4=寰呴��娆�;5=宸插叧闂�;")
private Integer payStatus;
+ @ApiModelProperty(value = "閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�", example = "1")
+ @ExcelColumn(name="閫�绉熺被鍨� 0鍒版湡閫�绉� 1鎹㈡埧閫�绉� 2杩濈害閫�绉� 3鍗忓晢閫�绉�")
+ private Integer btType;
+
+ @ApiModelProperty(value = "閫�绉熸搷浣滄椂闂�")
+ @ExcelColumn(name="閫�绉熸搷浣滄椂闂�")
+ private Date btActDate;
+
+ @ApiModelProperty(value = "閫�绉熸搷浣滀汉锛堝叧鑱攕ystem_user)", example = "1")
+ @ExcelColumn(name="閫�绉熸搷浣滀汉锛堝叧鑱攕ystem_user)")
+ private Integer btActUserId;
+
+ @ApiModelProperty(value = "閫�绉熷師鍥�")
+ @ExcelColumn(name="閫�绉熷師鍥�")
+ private String btInfo;
+
+ @ApiModelProperty(value = "閫�绉熸棩鏈�")
+ @ExcelColumn(name="閫�绉熸棩鏈�")
+ private Date btDate;
+
+ @ApiModelProperty(value = "閫�绉熺粡鍔炰汉缂栫爜", example = "1")
+ @ExcelColumn(name="閫�绉熺粡鍔炰汉缂栫爜")
+ private Integer btUserId;
+
+ @ApiModelProperty(value = "閫�绉熺鍒版棩鏈�")
+ @ExcelColumn(name="閫�绉熺鍒版棩鏈�")
+ private Date btSignDate;
+
+ @ApiModelProperty(value = "閫�绉熺粨绠楅噾棰濆悎璁�", example = "1")
+ @ExcelColumn(name="閫�绉熺粨绠楅噾棰濆悎璁�")
+ private BigDecimal btFee;
+
@ApiModelProperty(value = "瀹㈡埛鍚嶇О锛堜粯娆炬柟锛�", example = "1")
@ExcelColumn(name="瀹㈡埛鍚嶇О",index = 0,width = 10)
@TableField(exist = false)
private String customerName;
+ @ApiModelProperty(value = "瀹㈡埛榛樿鑱旂郴浜�", example = "1")
+ @TableField(exist = false)
+ private Integer customerUserId;
+
+ @ApiModelProperty(value = "瀹㈡埛涓婚敭", example = "1")
+ @TableField(exist = false)
+ private Integer customerId;
+
+ @ApiModelProperty(value = "鏄惁鍙戦�侀偖浠讹細0=鍚︼紱1=鍙戦�佹垚鍔燂紱2=鍙戦�佸け璐�", example = "1")
+ @TableField(exist = false)
+ private Integer isSendEmail;
+
+ @ApiModelProperty(value = "鏄惁鍙戦�佺煭淇★細0=鍚︼紱1=鍙戦�佹垚鍔燂紱2=鍙戦�佸け璐�", example = "1")
+ @TableField(exist = false)
+ private Integer isSendSms;
+
@ApiModelProperty(value = "鍏徃鍚嶇О", example = "1")
@TableField(exist = false)
private String companyName;
+
+ @ApiModelProperty(value = "鍗曞彿鏃ユ湡", example = "1",hidden = true)
+ @TableField(exist = false)
+ private String codeDate;
+
@ApiModelProperty(value = "鍚堝悓缂栧彿", example = "1")
@ExcelColumn(name="鍚堝悓缂栧彿",index = 2,width = 10)
@TableField(exist = false)
private String contractCode;
+ @ApiModelProperty(value = "鍚堝悓鐘舵��", example = "1")
+ @TableField(exist = false)
+ private Integer contractStatus;
+
@ApiModelProperty(value = "妤煎畤鎴块棿", example = "1")
@ExcelColumn(name="妤煎畤鎴块棿",index = 1,width = 10)
@TableField(exist = false)
private String roomPathName;
-
- @ApiModelProperty(value = "鎴块棿鏁版嵁", example = "1")
- @TableField(exist = false)
- private List<YwRoom> ywRoomList ;
-
@ApiModelProperty(value = "璁″垝浠樻鏃� - 寮�濮�")
@TableField(exist = false)
@JsonFormat(pattern = "yyyy-MM-dd")
private Date planPayDateStart;
+ @ApiModelProperty(value = "鍒涘缓浜哄悕绉�")
+ @ExcelColumn(name="鍒涘缓浜�",index = 9,width = 10)
+ @TableField(exist = false)
+ private String realname;
@ApiModelProperty(value = "璁″垝浠樻鏃� - 缁撴潫")
@TableField(exist = false)
@@ -143,24 +206,33 @@
@ApiModelProperty(value = "瀹炴敹閲戦")
@TableField(exist = false)
@ExcelColumn(name="瀹炴敹閲戦",index = 6,width = 6)
- private BigDecimal actReceivableFee;
+ private BigDecimal actReceivableFee = BigDecimal.ZERO;
@ApiModelProperty(value = "闇�鏀堕噾棰�")
@TableField(exist = false)
@ExcelColumn(name="闇�鏀堕噾棰�",index = 7,width = 6)
private BigDecimal needReceivableFee;
-
@ApiModelProperty(value = "鏄惁閫炬湡锛�0=鍚︼紱1=鏄�")
@TableField(exist = false)
@ExcelColumn(name="鏄惁閫炬湡",index = 9,width = 6,valueMapping = "0=鏈�炬湡锛�1=宸查�炬湡")
- private BigDecimal isOverdue;
+ private Integer isOverdue;
+ @ApiModelProperty(value = "鍚堝悓鍗曚环锛堝厓锛�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal price;
+
+ @ApiModelProperty(value = "浠樻鍛ㄦ湡绫诲瀷 0=鍏冩瘡骞崇背澶╋紱1=鍏冩瘡骞崇背鏈堬紱2=鍏冩瘡骞崇背骞达紱3=鍏冩瘡澶╋紱4=鍏冩瘡鏈堬紱5=鍏冩瘡骞达紱6=鍏冩瘡鍦猴紱", example = "1")
+ @TableField(exist = false)
+ private Integer circleType;
+
+ @ApiModelProperty(value = "鏉℃绫诲瀷 0绉熻祦鏉℃ 1鐗╀笟鏉℃", example = "1")
+ @TableField(exist = false)
+ private Integer detailType;
@ApiModelProperty(value = "闄勪欢淇℃伅", example = "1")
@TableField(exist = false)
private List<Multifile> multifileList;
-
@ApiModelProperty(value = "鍏宠仈鎴块棿鏁版嵁", example = "1")
@TableField(exist = false)
@@ -169,4 +241,18 @@
@ApiModelProperty(value = "鏀舵敮娴佹按", example = "1")
@TableField(exist = false)
private List<YwContractRevenue> ywContractRevenueList;
+
+ @ApiModelProperty(value = "绉熻祦鎬婚潰绉�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalArea;
+
+ @ApiModelProperty(value = "绉熻祦鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
+ @TableField(exist = false)
+ private Integer zlPayType;
+
+ @ApiModelProperty(value = "鐗╀笟鏀粯鏂瑰紡 0=涓�娆℃�т粯娆撅紱1=姣忎笁涓湀涓�浠橈紱2=鍏釜鏈堜竴浠橈紱3=涓�骞翠竴浠�", example = "1")
+ @TableField(exist = false)
+ private Integer wyPayType;
+
+
}
--
Gitblit v1.9.3