From 9dc93719a2c6903c5b342380fd185ba6bf607834 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jan 2024 10:30:08 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E5=AE=A2=E6=88=B7?=
 =?UTF-8?q?=E7=BB=9F=E8=AE=A1=EF=BC=88=E5=B9=B4=E5=BA=A6=E5=BE=85=E7=A1=AE?=
 =?UTF-8?q?=E6=94=B6=E9=87=91=E9=A2=9D=E5=89=8D=E4=BA=8C=E5=8D=81=EF=BC=89?=
 =?UTF-8?q?=20=E5=A2=9E=E5=8A=A0=E5=B9=B4=E4=BB=BD=E7=AD=9B=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/jero/index/contoller/IndexController.java | 6 +++---
 .../src/main/java/com/jero/index/service/IndexService.java  | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

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<HistogramVO> histogramVOS = indexService.top10Statistics();
+    public Result<?> top10Statistics(@RequestParam(name="year",required = false)String year) {
+        List<HistogramVO> 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<HistogramVO> top10Statistics() {
-        String year = String.valueOf(DateUtil.year(new DateTime()));
+    public List<HistogramVO> top10Statistics(String year) {
+        if (StringUtils.isBlank(year)){
+            year = String.valueOf(DateUtil.year(new DateTime()));
+        }
         Page<CompanyComeMoneyList> page = new Page<>(1, 20);
         CompanyComeMoneySearch companyComeMoneySearch = new CompanyComeMoneySearch();
         companyComeMoneySearch.setYear(year);