|
|
|
@@ -95,6 +95,7 @@ public class WxFinanceController extends BaseController { |
|
|
|
public ResultData feesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
record.setFeesType(EnumFeesType.NOMAL.getCode()); |
|
|
|
//record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); |
|
|
|
PageInfo<WxFinanceFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); |
|
|
|
return new ResultData(page); |
|
|
|
@@ -109,6 +110,7 @@ public class WxFinanceController extends BaseController { |
|
|
|
public ResultData advanceFeesList(@ModelAttribute WxFinanceFees record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
record.setFeesType(EnumFeesType.ADVANCE.getCode()); |
|
|
|
//record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); |
|
|
|
PageInfo<WxFinanceFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,true); |
|
|
|
return new ResultData(page); |
|
|
|
|