|
|
|
@@ -9,6 +9,7 @@ import com.iformall.domain.dto.FinanceSetOffDTO; |
|
|
|
import com.iformall.domain.po.WxBillPayWay; |
|
|
|
import com.iformall.domain.po.WxEnergyFees; |
|
|
|
import com.iformall.domain.po.WxFinanceReceive; |
|
|
|
import com.iformall.domain.po.WxFinanceReceiveSetoff; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.WxBillBaseEntity; |
|
|
|
import com.iformall.domain.vo.FinanceBillSetoffSum; |
|
|
|
@@ -259,7 +260,7 @@ public class WxFinanceController extends BaseController { |
|
|
|
public ResultData receiveList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); |
|
|
|
PageInfo<WxFinanceReceiveVo> page = wxFinanceService.receiveVoListAsPage(record, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@@ -300,7 +301,7 @@ public class WxFinanceController extends BaseController { |
|
|
|
public ResultData receiveSetoffList(@ModelAttribute WxFinanceReceive record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
PageInfo<WxFinanceReceive> page = wxFinanceService.receiveListAsPage(record, pageNum, pageSize); |
|
|
|
PageInfo<WxFinanceReceiveSetoff> page = wxFinanceService.receiveSetoffListAsPage(record, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
|