productDev/funingyunwei.git

			@@ -53,8 +53,8 @@
			private String title;
			@ApiModelProperty(value = "账单编号")
			private String code;
			@ApiModelProperty(value = "类型 0合同账单 1自建账单", example = "1")
			@ExcelColumn(name="账单来源",index = 12,width = 6,valueMapping = "0=合同账单;1=自建账单;")
			@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")
			@@ -62,11 +62,12 @@

			@ApiModelProperty(value = "开始时间")
			@ExcelColumn(name="计费开始日期",index = 10,width = 6,dateFormat = "yyyy-MM-dd")
			@DateTimeFormat(pattern = "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")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			private Date endDate;

			@ApiModelProperty(value = "实际付款日")
			@@ -75,7 +76,6 @@

			@ApiModelProperty(value = "计划付款日")
			@JsonFormat(pattern = "yyyy-MM-dd")
			@DateTimeFormat(pattern = "yyyy-MM-dd")
			private Date planPayDate;

			@ApiModelProperty(value = "合同条款编码（关联yw_contract_detail)", example = "1")
			@@ -105,7 +105,6 @@
			@ApiModelProperty(value = "费用类型：0=周期费用；1=一次性费用")
			@TableField(exist = false)
			private Integer feeType;

			@ApiModelProperty(value = "所属公司", example = "1")
			private Integer companyId;

			@@ -162,6 +161,9 @@
			@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)
			@@ -173,6 +175,10 @@
			@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)