From 1e3ca8738a6569936db26c2fc70b9a2bb0075b52 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 19 Jul 2024 19:27:41 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E6=9D=A5=E6=AC=BE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1-=E5=88=86=E7=B1=BB=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CompanyComeMoneyStatisticsController.java | 28 +++++++++++++++---- .../entity/CompanyComeMoneySearch.java | 5 ++++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java index f8b429cc..4f8b2a75 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/controller/CompanyComeMoneyStatisticsController.java @@ -235,7 +235,8 @@ public class CompanyComeMoneyStatisticsController { @ApiOperation(value = "企业来款统计-分类统计") @GetMapping(value = "/classification") public Result classification(CompanyComeMoneySearch companyComeMoneySearch, - HttpServletResponse response) { + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { String chargeCompanyId = companyComeMoneySearch.getChargeCompanyId(); List chargeCompanyIds; if (StringUtils.isNotBlank(chargeCompanyId)){ @@ -246,9 +247,16 @@ public class CompanyComeMoneyStatisticsController { chargeCompanyIds = list.stream().map(PayCompanyManagement::getId).collect(Collectors.toList()); companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); } - - String year = companyComeMoneySearch.getYear(); - List years = StrUtil.split(year, ','); + String year_begin = companyComeMoneySearch.getYear_begin(); + String year_end = companyComeMoneySearch.getYear_end(); + int integer1 = Integer.parseInt(year_begin); + int integer2 = Integer.parseInt(year_end); + int i = integer2 - integer1; + List years = new LinkedList<>(); + years.add(year_begin); + for (int i1 = 0; i1 < i; i1++) { + years.add(String.valueOf(integer1+i1)); + } companyComeMoneySearch.setYears(years); Map map = new HashMap<>(); //获取表头 @@ -351,8 +359,16 @@ public class CompanyComeMoneyStatisticsController { companyComeMoneySearch.setChargeCompanyIds(chargeCompanyIds); } - String year = companyComeMoneySearch.getYear(); - List years = StrUtil.split(year, ','); + String year_begin = companyComeMoneySearch.getYear_begin(); + String year_end = companyComeMoneySearch.getYear_end(); + int integer1 = Integer.parseInt(year_begin); + int integer2 = Integer.parseInt(year_end); + int i = integer2 - integer1; + List years = new LinkedList<>(); + years.add(year_begin); + for (int i1 = 0; i1 < i; i1++) { + years.add(String.valueOf(integer1+i1)); + } companyComeMoneySearch.setYears(years); Map map = new HashMap<>(); //获取表头 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java index 55cc2d22..6c07fada 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/statistics/entity/CompanyComeMoneySearch.java @@ -24,6 +24,11 @@ public class CompanyComeMoneySearch { @ApiModelProperty(value = "来款年份") private String year; + @ApiModelProperty(value = "来款年份开始") + private String year_begin; + @ApiModelProperty(value = "来款年份结束") + private String year_end; + private List years; @ApiModelProperty(value = "应收总金额")