productDev/funingyunwei.git

			@@ -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,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")
			@@ -66,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)")
			@@ -74,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 = "项目编码（关联yw_project)", example = "1")
			@@ -117,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")
			@@ -135,17 +128,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 +146,29 @@
			@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;
			}