Browse Source

fix

release_toaliyun_real
winter 1 year ago
parent
commit
037050e590
2 changed files with 12 additions and 1 deletions
  1. +10
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java

+ 10
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java View File

@@ -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);
}


+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyFees.java View File

@@ -184,5 +184,7 @@ public class WxEnergyFees extends TenantEntity {
private List<Integer> billTypeList;
@TableField(exist = false)
private Integer isAllList;
@TableField(exist = false)
private Integer isFeesShopQuery;
}

Loading…
Cancel
Save