productDev/funingyunwei.git

			@@ -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;
			@@ -50,13 +51,14 @@
			@ExcelColumn(name="是否删除0否 1是")
			private Integer isdeleted;

			@ApiModelProperty(value = "备注")
			@ExcelColumn(name="备注")
			@ApiModelProperty(value = "合同摘要")
			@ExcelColumn(name="合同摘要")
			private String remark;

			@ApiModelProperty(value = "状态 0待执行 1执行中 2已到期 3已退租", example = "1")
			@ExcelColumn(name="状态 0待执行 1执行中 2已到期 3已退租")
			@ApiModelProperty(value = "状态 0待执行 1执行中 2已到期 3退租中 4已退租", example = "1")
			@ExcelColumn(name="状态 0待执行 1执行中 2已到期 3退租中 4已退租")
			private Integer status;

			@ApiModelProperty(value = "账单结清状态： 0待付款 1部分收款 2已结清 3已关闭", example = "1")
			@ExcelColumn(name="账单结清状态： 0待付款 1部分收款 2已结清 3已关闭")
			private Integer billStatus;
			@@ -75,14 +77,17 @@

			@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")
			@@ -104,10 +109,59 @@
			@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 = "退租操作人（关联system_user)", example = "1")
			@ExcelColumn(name="退租操作人（关联system_user)")
			private Integer btActUserId;

			@ApiModelProperty(value = "退租原因")
			@ExcelColumn(name="退租原因")
			private String btInfo;

			@ApiModelProperty(value = "退租摘要")
			@ExcelColumn(name="退租摘要")
			private String btRemark;

			@ApiModelProperty(value = "退租日期")
			@ExcelColumn(name="退租日期")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date btDate;

			@ApiModelProperty(value = "退租经办人编码", example = "1")
			@ExcelColumn(name="退租经办人编码")
			private Integer btUserId;

			@ApiModelProperty(value = "退租签到日期")
			@ExcelColumn(name="退租签到日期")
			@JsonFormat(pattern = "yyyy-MM-dd")
			private Date btSignDate;

			@ApiModelProperty(value = "退租结算金额合计", example = "1")
			@ExcelColumn(name="退租结算金额合计")
			private BigDecimal btFee;
			@ApiModelProperty(value = "租赁条款押金（元）", example = "1")
			@ExcelColumn(name="租赁条款押金（元）")
			private BigDecimal zlDeposit;
			@ApiModelProperty(value = "首期租赁条款单价（元）", example = "1")
			@ExcelColumn(name="首期租赁条款单价（元）")
			private BigDecimal zlFirstPrice;
			@ApiModelProperty(value = "首期租赁条款价格单位", example = "1")
			@ExcelColumn(name="首期租赁条款价格单位")
			private Integer zlFirstCircle;
			@ApiModelProperty(value = "物业租赁条款单价（元）", example = "1")
			@ExcelColumn(name="物业租赁条款单价（元）")
			private BigDecimal wyFirstPrice;
			@ApiModelProperty(value = "物业租赁条款价格单位", example = "1")
			@ExcelColumn(name="物业租赁条款价格单位")
			private Integer wyFirstCircle;


			@ApiModelProperty(value = "租赁支付方式 0=一次性付款；1=每三个月一付；2=六个月一付；3=一年一付", example = "1")
			@ExcelColumn(name="租赁支付方式 0=一次性付款；1=每三个月一付；2=六个月一付；3=一年一付")
			@@ -115,10 +169,12 @@

			@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")
			@@ -131,10 +187,12 @@

			@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")
			@@ -146,6 +204,12 @@
			@ExcelColumn(name="物业费总金额")
			private BigDecimal wyTotalFee;

			@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;
			@@ -179,11 +243,69 @@
			@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 = "合同总费用",notes = "合同初始化时金额", example = "1")
			@TableField(exist = false)
			private BigDecimal totalFee;

			@ApiModelProperty(value = "查询结束时间")
			@TableField(exist = false)
			private Date queryEndTime;
			@ApiModelProperty(value = "退款关闭账单数")
			@TableField(exist = false)
			private int btCLoseBill;
			@ApiModelProperty(value = "退款未结清账单数")
			@TableField(exist = false)
			private int btWaitBill;
			@ApiModelProperty(value = "生成账单类型 0租赁账单 1物业账单")
			@TableField(exist = false)
			private int billType;

			@ApiModelProperty(value = "租赁租赁条款价格单位，概念名称", example = "1")
			@TableField(exist = false)
			private String zlFirstCircleStr;
			@ApiModelProperty(value = "物业租赁条款价格单位，概念名称", example = "1")
			@TableField(exist = false)
			private String wyFirstCircleStr;
			@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;



			}