From 1a64b4bcc938db743396382a30f3b10136a1a27a Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 25 十一月 2024 15:38:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 95 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 83 insertions(+), 12 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 a2faed2..99b45fa 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
@@ -36,7 +36,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -45,7 +44,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -56,9 +54,12 @@
@ExcelColumn(name="澶囨敞")
private String remark;
- @ApiModelProperty(value = "鐘舵�� 0姝ｅ父 1鎹熷潖 2鎶ュ簾", example = "1")
- @ExcelColumn(name="鐘舵�� 0姝ｅ父 1鎹熷潖 2鎶ュ簾")
+ @ApiModelProperty(value = "鐘舵�� 0寰呮墽琛� 1鎵ц涓� 2宸插埌鏈� 3宸查��绉�", example = "1")
+ @ExcelColumn(name="鐘舵�� 0寰呮墽琛� 1鎵ц涓� 2宸插埌鏈� 3宸查��绉�")
private Integer status;
+ @ApiModelProperty(value = "璐﹀崟缁撴竻鐘舵�侊細 0寰呬粯娆� 1閮ㄥ垎鏀舵 2宸茬粨娓� 3宸插叧闂�", example = "1")
+ @ExcelColumn(name="璐﹀崟缁撴竻鐘舵�侊細 0寰呬粯娆� 1閮ㄥ垎鏀舵 2宸茬粨娓� 3宸插叧闂�")
+ private Integer billStatus;
@ApiModelProperty(value = "绫诲瀷 0鐗╀笟绉熻祦 1鐗╀笟 2绉熻祦", example = "1")
@ExcelColumn(name="绫诲瀷 0鐗╀笟绉熻祦 1鐗╀笟 2绉熻祦")
@@ -66,7 +67,7 @@
@ApiModelProperty(value = "缂栧彿", example = "1")
@ExcelColumn(name="缂栧彿")
- private Integer code;
+ private String code;
@ApiModelProperty(value = "缁忓姙浜虹紪鐮�(鍏宠仈system_user)", example = "1")
@ExcelColumn(name="缁忓姙浜虹紪鐮�(鍏宠仈system_user)")
@@ -74,17 +75,14 @@
@ApiModelProperty(value = "绛捐鏃ユ湡")
@ExcelColumn(name="绛捐鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date signDate;
@ApiModelProperty(value = "寮�濮嬫棩鏈�")
@ExcelColumn(name="寮�濮嬫棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date startDate;
@ApiModelProperty(value = "缁撴潫鏃ユ湡")
@ExcelColumn(name="缁撴潫鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date endDate;
@ApiModelProperty(value = "椤圭洰缂栫爜锛堝叧鑱攜w_project)", example = "1")
@@ -106,7 +104,37 @@
@ApiModelProperty(value = "鑱旂郴浜虹紪鐮侊紙鍏宠仈memebr)", example = "1")
@ExcelColumn(name="鑱旂郴浜虹紪鐮侊紙鍏宠仈memebr)")
private Integer memberId;
+ @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="绉熻祦鏉℃鎶奸噾锛堝厓锛�")
private BigDecimal zlDeposit;
@@ -117,12 +145,10 @@
@ApiModelProperty(value = "绉熻祦鍏嶇鏈熷紑濮嬫棩鏈�")
@ExcelColumn(name="绉熻祦鍏嶇鏈熷紑濮嬫棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlFreeStartDate;
@ApiModelProperty(value = "绉熻祦鍏嶇鏈熺粨鏉熸棩鏈�")
@ExcelColumn(name="绉熻祦鍏嶇鏈熺粨鏉熸棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date zlFreeEndDate;
@ApiModelProperty(value = "鐗╀笟鎶奸噾锛堝厓锛�", example = "1")
@@ -135,17 +161,16 @@
@ApiModelProperty(value = "鐗╀笟鍏嶇鏈熷紑濮嬫棩鏈�")
@ExcelColumn(name="鐗╀笟鍏嶇鏈熷紑濮嬫棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date wyFreeStartDate;
@ApiModelProperty(value = "鐗╀笟鍏嶇鏈熺粨鏉熸棩鏈�")
@ExcelColumn(name="鐗╀笟鍏嶇鏈熺粨鏉熸棩鏈�")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date wyFreeEndDate;
@ApiModelProperty(value = "绉熻祦鎬婚噾棰�", example = "1")
@ExcelColumn(name="绉熻祦鎬婚噾棰�")
private BigDecimal zlTotalFee;
+
@ApiModelProperty(value = "鐗╀笟璐规�婚噾棰�", example = "1")
@ExcelColumn(name="鐗╀笟璐规�婚噾棰�")
@@ -154,5 +179,51 @@
@ApiModelProperty(value = "闄勪欢闆嗗悎")
@TableField(exist = false)
private List<Multifile> fileList;
+ @ApiModelProperty(value = "鎴挎簮缂栫爜闆嗗悎")
+ @TableField(exist = false)
+ private List<Integer> roomIds;
+ @ApiModelProperty(value = "绉熻祦鏉℃闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractDetail> zlDetailList;
+ @ApiModelProperty(value = "鎴挎簮瀵硅薄闆嗗悎")
+ @TableField(exist = false)
+ private List<YwRoom> roomList;
+ @ApiModelProperty(value = "鍏徃鍚嶇О")
+ @TableField(exist = false)
+ private String companyName;
+ @ApiModelProperty(value = "缁忓姙浜哄鍚�")
+ @TableField(exist = false)
+ private String userName;
+ @ApiModelProperty(value = "椤圭洰鍚�")
+ @TableField(exist = false)
+ private String projectName;
+ @ApiModelProperty(value = "绉熷鍚嶇О")
+ @TableField(exist = false)
+ private String renterName;
+ @ApiModelProperty(value = "鍒涘缓浜哄鍚�")
+ @TableField(exist = false)
+ private String creatorName;
+ @ApiModelProperty(value = "绉熻祦鎬婚潰绉�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalArea;
+ @ApiModelProperty(value = "鐗╀笟鏉℃闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractDetail> wyDetailList;
+ @ApiModelProperty(value = "鎿嶄綔鏃ュ織闆嗗悎")
+ @TableField(exist = false)
+ private List<YwWorkorderLog> logList;
+ @ApiModelProperty(value = "璐﹀崟闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractBill> billList;
+ @ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date queryStartTime;
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date queryEndTime;
+
+ @ApiModelProperty(value = "閫�绉熸椂鏂板鐨勬敹浠樻璐﹀崟")
+ @TableField(exist = false)
+ private List<YwContractBill> addBillList;
}
--
Gitblit v1.9.3