Sfoglia il codice sorgente

fix

release_toaliyun_real
winter 1 anno fa
parent
commit
06b9b38117
1 ha cambiato i file con 2 aggiunte e 0 eliminazioni
  1. +2
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java

+ 2
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxFinanceController.java Vedi File

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


Caricamento…
Annulla
Salva