|
|
|
@@ -628,7 +628,7 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize,Boolean isList) { |
|
|
|
public ResultData list(@ModelAttribute WxAllBill record, Integer pageNum, Integer pageSize) { |
|
|
|
if (record == null) record = new WxAllBill(); |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
@@ -668,5 +668,27 @@ public class WxAllBillController extends BillBaseController { |
|
|
|
} |
|
|
|
wxAllBillService.exportBill(request, response, wxBillRent); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("统计接口") |
|
|
|
@GetMapping("sum") |
|
|
|
public ResultData sum(@ModelAttribute WxAllBill record) { |
|
|
|
if (record == null) record = new WxAllBill(); |
|
|
|
record.updateTenantInfo(getTenantInfo()); |
|
|
|
WxUserDataRule dataRule = this.getCurrentDataFloors(); |
|
|
|
if (null != dataRule) { |
|
|
|
record.setFloorForRule(dataRule.getFloorIds()); |
|
|
|
record.setBusinessForRule(dataRule.getBussinessIds()); |
|
|
|
} |
|
|
|
if (null != record.getOnlyOweOrNear()) { |
|
|
|
if (EnumBillOweOrNearType.OWE.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); |
|
|
|
}else if (EnumBillOweOrNearType.NEAR.getCode().intValue() == record.getOnlyOweOrNear().intValue()) { |
|
|
|
record.setOweBillLastTime(billAllHelper.getDateBefore(getOweBillBeforeDays())); |
|
|
|
record.setNearBillLastTime(billAllHelper.getDateBefore(getNearBillBeforeDays())); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
return new ResultData(wxAllBillService.getBillMonthSum(record)); |
|
|
|
} |
|
|
|
|
|
|
|
} |