From d764a28d914571e7a6c62d85b6e81e70328ecfdb Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期六, 23 十一月 2024 17:32:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContract.java | 47 +++++++++++++++++++++++++++++++++++------------
1 files changed, 35 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 458b359..bc6981a 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
@@ -1,7 +1,9 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.model.LoginUserModel;
+import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import com.baomidou.mybatisplus.annotation.IdType;
@@ -11,6 +13,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import java.util.Date;
import java.math.BigDecimal;
+import java.util.List;
/**
* 杩愮淮鍚堝悓淇℃伅琛�
@@ -33,7 +36,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -42,7 +44,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -53,8 +54,8 @@
@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绉熻祦", example = "1")
@@ -63,7 +64,7 @@
@ApiModelProperty(value = "缂栧彿", example = "1")
@ExcelColumn(name="缂栧彿")
- private Integer code;
+ private String code;
@ApiModelProperty(value = "缁忓姙浜虹紪鐮�(鍏宠仈system_user)", example = "1")
@ExcelColumn(name="缁忓姙浜虹紪鐮�(鍏宠仈system_user)")
@@ -71,17 +72,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")
@@ -114,12 +112,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")
@@ -132,20 +128,47 @@
@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="鐗╀笟璐规�婚噾棰�")
private BigDecimal wyTotalFee;
+ @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 = "绉熻祦鎬婚潰绉�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal totalArea;
+ @ApiModelProperty(value = "鐗╀笟鏉℃闆嗗悎")
+ @TableField(exist = false)
+ private List<YwContractDetail> wyDetailList;
+ @ApiModelProperty(value = "閲嶆柊寮�濮嬫椂闂�")
+ @TableField(exist = false)
+ private Date queryStartTime;
+
+ @ApiModelProperty(value = "鏌ヨ缁撴潫鏃堕棿")
+ @TableField(exist = false)
+ private Date queryEndTime;
}
--
Gitblit v1.9.3