| @@ -79,6 +79,24 @@ public class WxBillAll extends BaseEntity { | |||||
| private List<Integer> billTypeList; | private List<Integer> billTypeList; | ||||
| @Transient | |||||
| @SortColumn(column = "rentReceivePay") | |||||
| private Integer rentReceivePay; | |||||
| @Transient | |||||
| @SortColumn(column = "propertyReceivePay") | |||||
| private Integer propertyReceivePay; | |||||
| @Transient | |||||
| @SortColumn(column = "depositReceivePay") | |||||
| private Integer depositReceivePay; | |||||
| @Transient | |||||
| @SortColumn(column = "otherReceivePay") | |||||
| private Integer otherReceivePay; | |||||
| @Transient | |||||
| @SortColumn(column = "totalReceivePay") | |||||
| private Integer totalReceivePay; | |||||
| @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") | @io.swagger.annotations.ApiModelProperty(value = "过滤已收金额1过滤", name = "filterHasPay") | ||||
| @Transient | @Transient | ||||
| private Integer filterHasPay; | private Integer filterHasPay; | ||||
| @@ -496,6 +496,7 @@ | |||||
| select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, | select bill.tenant_id tenantId,bill.merchant_id merchantId,m.name merchantName,bill.bill_type billType, | ||||
| m.link_phone managerPhone,m.`link_person` manager,m.email, | m.link_phone managerPhone,m.`link_person` manager,m.email, | ||||
| bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,ws.building,ws.floor, | bill.receive_date receiveDate,DATEDIFF(now(),bill.receive_date) expiredDay,ws.building,ws.floor, | ||||
| round(bill.rentOwe/100,2) rentOwe, | round(bill.rentOwe/100,2) rentOwe, | ||||
| round(bill.propertyOwe/100,2) propertyOwe, | round(bill.propertyOwe/100,2) propertyOwe, | ||||
| round(bill.depositOwe/100,2) depositOwe, | round(bill.depositOwe/100,2) depositOwe, | ||||