diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java index 9045dcb4..65d1e8a1 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java @@ -93,10 +93,10 @@ public class IndexController { } } - @ApiOperation(value = "前十统计") + @ApiOperation(value = "企业客户统计(年度待确收金额前二十)") @GetMapping(value = "/top10Statistics") - public Result top10Statistics() { - List histogramVOS = indexService.top10Statistics(); + public Result top10Statistics(@RequestParam(name="year",required = false)String year) { + List histogramVOS = indexService.top10Statistics(year); return Result.OK(histogramVOS); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java index 6aeba295..a2ca396f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java @@ -244,8 +244,10 @@ public class IndexService { return histogramVOlist; } - public List top10Statistics() { - String year = String.valueOf(DateUtil.year(new DateTime())); + public List top10Statistics(String year) { + if (StringUtils.isBlank(year)){ + year = String.valueOf(DateUtil.year(new DateTime())); + } Page page = new Page<>(1, 20); CompanyComeMoneySearch companyComeMoneySearch = new CompanyComeMoneySearch(); companyComeMoneySearch.setYear(year);