|
|
|
@@ -581,65 +581,65 @@ public class WxBillAllHelper { |
|
|
|
WxBillRent wxBillRent = new WxBillRent(); |
|
|
|
updateQueryParm(wxMerchant, wxBillRent,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRent.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillRent> rentpage = wxBillRentService.listAsPage(wxBillRent, 1, 30); |
|
|
|
if (null != rentpage && null != rentpage.getList() && rentpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(rentpage.getList()); |
|
|
|
List<WxBillRent> rentpage = wxBillRentService.list(wxBillRent); |
|
|
|
if (null != rentpage && rentpage.size() > 0 ) { |
|
|
|
retList.addAll(rentpage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillRentManage wxBillRentManage = new WxBillRentManage(); |
|
|
|
updateQueryParm(wxMerchant, wxBillRentManage,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillRentManage.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillRentManage> managepage = wxBillRentManageService.listAsPage(wxBillRentManage, 1, 30); |
|
|
|
if (null != managepage && null != managepage.getList() && managepage.getList().size() > 0 ) { |
|
|
|
retList.addAll(managepage.getList()); |
|
|
|
List<WxBillRentManage> managepage = wxBillRentManageService.list(wxBillRentManage); |
|
|
|
if (null != managepage && managepage.size() > 0 ) { |
|
|
|
retList.addAll(managepage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillDeposit wxBillDeposit = new WxBillDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillDeposit.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillDeposit> rentdepostpage = wxBillRentDepositService.listAsPage(wxBillDeposit, 1, 30); |
|
|
|
if (null != rentdepostpage && null != rentdepostpage.getList() && rentdepostpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(rentdepostpage.getList()); |
|
|
|
List<WxBillDeposit> rentdepostpage = wxBillRentDepositService.list(wxBillDeposit); |
|
|
|
if (null != rentdepostpage && rentdepostpage.size() > 0 ) { |
|
|
|
retList.addAll(rentdepostpage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillProperty wxBillProperty = new WxBillProperty(); |
|
|
|
updateQueryParm(wxMerchant, wxBillProperty,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillProperty.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillProperty> propertypage = wxBillPropertyService.listAsPage(wxBillProperty, 1, 30); |
|
|
|
if (null != propertypage && null != propertypage.getList() && propertypage.getList().size() > 0 ) { |
|
|
|
retList.addAll(propertypage.getList()); |
|
|
|
List<WxBillProperty> propertypage = wxBillPropertyService.list(wxBillProperty); |
|
|
|
if (null != propertypage && propertypage.size() > 0 ) { |
|
|
|
retList.addAll(propertypage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillPropertyDeposit wxBillPropertyDeposit = new WxBillPropertyDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillPropertyDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillPropertyDeposit.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillPropertyDeposit> propertyDepositpage = wxBillPropertyDepositService.listAsPage(wxBillPropertyDeposit, 1, 30); |
|
|
|
if (null != propertyDepositpage && null != propertyDepositpage.getList() && propertyDepositpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(propertyDepositpage.getList()); |
|
|
|
List<WxBillPropertyDeposit> propertyDepositpage = wxBillPropertyDepositService.list(wxBillPropertyDeposit); |
|
|
|
if (null != propertyDepositpage && propertyDepositpage.size() > 0 ) { |
|
|
|
retList.addAll(propertyDepositpage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillDaily wxBillDaily = new WxBillDaily(); |
|
|
|
updateQueryParm(wxMerchant, wxBillDaily,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillDaily.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillDaily> dailypage = wxBillDailyService.listAsPage(wxBillDaily, 1, 30); |
|
|
|
if (null != dailypage && null != dailypage.getList() && dailypage.getList().size() > 0 ) { |
|
|
|
retList.addAll(dailypage.getList()); |
|
|
|
List<WxBillDaily> dailypage = wxBillDailyService.list(wxBillDaily); |
|
|
|
if (null != dailypage && dailypage.size() > 0 ) { |
|
|
|
retList.addAll(dailypage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillOther wxBillOther = new WxBillOther(); |
|
|
|
updateQueryParm(wxMerchant, wxBillOther,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillOther.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillOther> otherpage = wxBillOtherService.listAsPage(wxBillOther, 1, 30); |
|
|
|
if (null != otherpage && null != otherpage.getList() && otherpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(otherpage.getList()); |
|
|
|
List<WxBillOther> otherpage = wxBillOtherService.list(wxBillOther); |
|
|
|
if (null != otherpage && otherpage.size() > 0 ) { |
|
|
|
retList.addAll(otherpage); |
|
|
|
} |
|
|
|
|
|
|
|
WxBillOtherDeposit wxBillOtherDeposit = new WxBillOtherDeposit(); |
|
|
|
updateQueryParm(wxMerchant, wxBillOtherDeposit,wxMerchant.getStarttime(),wxMerchant.getEndtime()); |
|
|
|
wxBillOtherDeposit.setSortColumns("starttime asc"); |
|
|
|
PageInfo<WxBillOtherDeposit> odpage = wxBillOtherDepositService.listAsPage(wxBillOtherDeposit, 1, 30); |
|
|
|
if (null != odpage && null != odpage.getList() && odpage.getList().size() > 0 ) { |
|
|
|
retList.addAll(odpage.getList()); |
|
|
|
List<WxBillOtherDeposit> odpage = wxBillOtherDepositService.list(wxBillOtherDeposit); |
|
|
|
if (null != odpage && odpage.size() > 0 ) { |
|
|
|
retList.addAll(odpage); |
|
|
|
} |
|
|
|
return retList; |
|
|
|
} |
|
|
|
|