|
|
|
@@ -577,7 +577,16 @@ public class WxEnergyController extends BaseController { |
|
|
|
public ResultData feesList(@ModelAttribute WxEnergyFees record, Integer pageNum, Integer pageSize) { |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
record.setBillType(EnumBillAllType.DAILY.getCode()); |
|
|
|
if (null != record.getIsFeesShopQuery() && record.getIsFeesShopQuery() == EnumYesOrNo.YES.getCode()) { |
|
|
|
List<Integer> billTypeList = new ArrayList<Integer>(); |
|
|
|
billTypeList.add(EnumBillAllType.DAILY.getCode()); |
|
|
|
billTypeList.add(EnumBillAllType.OTHER.getCode()); |
|
|
|
record.setBillTypeList(billTypeList); |
|
|
|
record.setCashierType(EnumFinanceCashierType.RECEIVE.getCode()); |
|
|
|
record.setFixedPrice(EnumYesOrNo.NO.getCode()); |
|
|
|
}else { |
|
|
|
record.setBillType(EnumBillAllType.DAILY.getCode()); |
|
|
|
} |
|
|
|
PageInfo<WxEnergyFees> page = wxEnergyService.feesListAsPage(record, pageNum, pageSize,false); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|