| @@ -141,6 +141,18 @@ public class WxBillDaily extends BaseEntity{ | |||||
| @SortColumn(column = "period") | @SortColumn(column = "period") | ||||
| private Integer period; | private Integer period; | ||||
| @Transient | |||||
| @SortColumn(column = "shopNumber") | |||||
| private String shopNumber; | |||||
| public String getShopNumber() { | |||||
| return shopNumber; | |||||
| } | |||||
| public void setShopNumber(String shopNumber) { | |||||
| this.shopNumber = shopNumber; | |||||
| } | |||||
| public Integer getAllPeriod() { | public Integer getAllPeriod() { | ||||
| return allPeriod; | return allPeriod; | ||||
| } | } | ||||
| @@ -140,6 +140,27 @@ public class WxBillProperty extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| @SortColumn(column = "allPeriod") | @SortColumn(column = "allPeriod") | ||||
| private Integer allPeriod; | private Integer allPeriod; | ||||
| @Transient | |||||
| @SortColumn(column = "shopNumber") | |||||
| private String shopNumber; | |||||
| @Transient | |||||
| private Integer depositStatus; | |||||
| public String getShopNumber() { | |||||
| return shopNumber; | |||||
| } | |||||
| public void setShopNumber(String shopNumber) { | |||||
| this.shopNumber = shopNumber; | |||||
| } | |||||
| public Integer getDepositStatus() { | |||||
| return depositStatus; | |||||
| } | |||||
| public void setDepositStatus(Integer depositStatus) { | |||||
| this.depositStatus = depositStatus; | |||||
| } | |||||
| public Integer getAllPeriod() { | public Integer getAllPeriod() { | ||||
| return allPeriod; | return allPeriod; | ||||
| @@ -151,6 +151,14 @@ public class WxBillRent extends BaseEntity { | |||||
| @Transient | @Transient | ||||
| private Integer depositStatus; | private Integer depositStatus; | ||||
| public String getShopNumber() { | |||||
| return shopNumber; | |||||
| } | |||||
| public void setShopNumber(String shopNumber) { | |||||
| this.shopNumber = shopNumber; | |||||
| } | |||||
| public Integer getDepositStatus() { | public Integer getDepositStatus() { | ||||
| return depositStatus; | return depositStatus; | ||||
| } | } | ||||
| @@ -107,7 +107,8 @@ | |||||
| <if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if> | <if test=" null != propertyContractId ">and br.`property_contract_id` = #{propertyContractId}</if> | ||||
| <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | <if test=" null != payWay ">and br.`pay_way` = #{payWay}</if> | ||||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | ||||
| <if test=" null != latePayStatus ">and br.`late_pay_status` = #{latePayStatus}</if> | |||||
| <if test=" null != depositStatus ">and d.`status` = #{depositStatus}</if> | |||||
| </where> | </where> | ||||
| <if test=" null != sortColumns">order by ${sortColumns}</if> | <if test=" null != sortColumns">order by ${sortColumns}</if> | ||||
| </select> | </select> | ||||