| @@ -45,25 +45,25 @@ public class WxBillRent extends TenantEntity { | |||||
| return new BigDecimal(pay == null ? 0 : pay).divide(new BigDecimal(100)).toPlainString(); | return new BigDecimal(pay == null ? 0 : pay).divide(new BigDecimal(100)).toPlainString(); | ||||
| } | } | ||||
| @Excel(name = "实收账款(元)", width = 20, orderNum = "7") | |||||
| @Excel(name = "实收账款(元)", width = 20, orderNum = "9") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String payStr; | private String payStr; | ||||
| @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | @io.swagger.annotations.ApiModelProperty(value="实收金额",name="pay") | ||||
| private Long pay; | private Long pay; | ||||
| @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "10") | |||||
| @Excel(name = "缴款截止日期", format = "yyyy-MM-dd", width = 20, orderNum = "13") | |||||
| @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | @io.swagger.annotations.ApiModelProperty(value="收款日期",name="receiveDate") | ||||
| private Date receiveDate; | private Date receiveDate; | ||||
| @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "11") | |||||
| @Excel(name = "收款日期", format = "yyyy-MM-dd", width = 20, orderNum = "12") | |||||
| @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | @io.swagger.annotations.ApiModelProperty(value="到账日期",name="payDate") | ||||
| private Date payDate; | private Date payDate; | ||||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createtime") | ||||
| private Date createtime; | private Date createtime; | ||||
| @Excel(name = "逾期(天) ", width = 20, orderNum = "13") | |||||
| @Excel(name = "逾期(天) ", width = 20, orderNum = "14") | |||||
| @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | @io.swagger.annotations.ApiModelProperty(value="逾期天数",name="expiredDay") | ||||
| private Long expiredDay; | private Long expiredDay; | ||||
| @@ -74,11 +74,11 @@ public class WxBillRent extends TenantEntity { | |||||
| return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString(); | return new BigDecimal(owe == null ? 0 : owe).divide(new BigDecimal(100)).toPlainString(); | ||||
| } | } | ||||
| @Excel(name = "欠缴金额(元)", width = 20, orderNum = "9") | |||||
| @Excel(name = "欠缴金额(元)", width = 20, orderNum = "11") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String oweStr; | private String oweStr; | ||||
| @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "8") | |||||
| @Excel(name = "状态", replace = {"欠缴_1", "待缴_2", "已结清_3", "未到期_4", "已退还_5", "失效_6"}, width = 20, orderNum = "10") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | @io.swagger.annotations.ApiModelProperty(value = "账单状态1欠缴2待缴3已结清4未到期", name = "status") | ||||
| private Integer status; | private Integer status; | ||||
| @@ -88,6 +88,15 @@ public class WxBillRent extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value="原合同应收金额",name="contractNeedPay") | @io.swagger.annotations.ApiModelProperty(value="原合同应收金额",name="contractNeedPay") | ||||
| private Long contractNeedPay; | private Long contractNeedPay; | ||||
| @Excel(name = "原合同应收金额(元)", width = 20, orderNum = "6") | |||||
| @TableField(exist = false) | |||||
| private String contractNeedPayStr; | |||||
| public String getContractNeedPayStr() { | |||||
| return new BigDecimal(contractNeedPay == null ? 0 : contractNeedPay).divide(new BigDecimal(100)).toPlainString(); | |||||
| } | |||||
| @Excel(name = "原合同应收金额明细(元)", replace = {"租金_rentPrice", "场地费_siteMoney", "设备费_facilityMoney", "商业管理费_administratorMoney"}, width = 20, orderNum = "7") | |||||
| @io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo") | @io.swagger.annotations.ApiModelProperty(value = "合同应收明细", name = "rentPriceInfo") | ||||
| private String rentPriceInfo; | private String rentPriceInfo; | ||||
| @@ -212,7 +221,7 @@ public class WxBillRent extends TenantEntity { | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private Long realReceivePay; | private Long realReceivePay; | ||||
| @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "6") | |||||
| @Excel(name = "实际应收总金额(元)", width = 20, orderNum = "8") | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String realReceivePayStr; | private String realReceivePayStr; | ||||