From f982a747e1cf1bb6d92bafd6747364c388ecf02e Mon Sep 17 00:00:00 2001 From: lijiarao Date: Mon, 24 Oct 2022 09:36:39 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E5=BA=94=E6=94=B6=E8=B4=A6=E6=AC=BE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E5=A2=9E=E5=8A=A0=E7=99=BE=E5=88=86?= =?UTF-8?q?=E6=AF=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jero/index/contoller/IndexController.java | 2 +- .../com/jero/index/service/IndexService.java | 20 ++++++++++++++++--- .../jero/index/vo/UncollectedPieChartVO.java | 2 ++ 3 files changed, 20 insertions(+), 4 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 5918fe44..d06fc65e 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 @@ -97,7 +97,7 @@ public class IndexController { return Result.OK(histogramVOS); } - @ApiOperation(value = "未收账款统计") + @ApiOperation(value = "应收账款统计") @GetMapping(value = "/uncollected") public Result> uncollected(@RequestParam(name="departCode",required = false)String departCode) { List uncollectedPieChartVOS = indexService.uncollected(departCode); 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 6bd2de33..116d97c3 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 @@ -235,7 +235,7 @@ public class IndexService { PieChartVO pieChartVO = new PieChartVO(); pieChartVO.setName(chargeUse); BigDecimal divide; - if (all.equals(BigDecimal.ZERO)){ + if (all.compareTo(BigDecimal.ZERO) == 0){ divide = BigDecimal.ZERO; }else { divide = money @@ -283,10 +283,24 @@ public class IndexService { UncollectedPieChartVO uncollectedPieChartVO4 = setUncollectedPieChartVO("一年以上", 361, null, departCode); uncollectedPieChartVOList.add(uncollectedPieChartVO4); //总数 - BigDecimal reduce = uncollectedPieChartVOList.stream().map(i -> new BigDecimal(i.getMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + BigDecimal all = uncollectedPieChartVOList.stream().map(i -> new BigDecimal(i.getMoney())).reduce(BigDecimal.ZERO, BigDecimal::add); + for (UncollectedPieChartVO uncollectedPieChartVO : uncollectedPieChartVOList) { + String money = uncollectedPieChartVO.getMoney(); + BigDecimal one = new BigDecimal(money); + BigDecimal divide; + if (all.compareTo(BigDecimal.ZERO) == 0){ + divide = BigDecimal.ZERO; + }else { + divide = one + .divide(all,3,RoundingMode.HALF_DOWN) + .multiply(new BigDecimal(100)) + .setScale(1, RoundingMode.UNNECESSARY); + } + uncollectedPieChartVO.setValue(divide.toString()); + } UncollectedPieChartVO uncollectedPieChartVO = new UncollectedPieChartVO(); uncollectedPieChartVO.setName("总数"); - uncollectedPieChartVO.setMoney(String.valueOf(reduce)); + uncollectedPieChartVO.setMoney(String.valueOf(all)); uncollectedPieChartVOList.add(uncollectedPieChartVO); return uncollectedPieChartVOList; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java index 78eba215..81f78875 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/UncollectedPieChartVO.java @@ -11,6 +11,8 @@ import lombok.Data; public class UncollectedPieChartVO { @ApiModelProperty(value = "分类") private String name; + @ApiModelProperty(value = "值") + private String value; @ApiModelProperty(value = "金额") private String money; }