add 应收账款统计 增加百分比

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<List<UncollectedPieChartVO>> uncollected(@RequestParam(name="departCode",required = false)String departCode) {
         List<UncollectedPieChartVO> uncollectedPieChartVOS = indexService.uncollected(departCode);

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;
     }

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;
 }