From 5a024fcc5f9e724c4333e76e309079023c62e51c Mon Sep 17 00:00:00 2001 From: lijiarao Date: Sat, 3 Sep 2022 09:37:25 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E6=94=B6=E5=85=A5=E5=88=86=E7=B1=BB?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=E8=BF=94=E5=9B=9E=E5=80=BC=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/jero/index/service/IndexService.java | 1 + .../src/main/java/com/jero/index/vo/PieChartVO.java | 4 ++++ .../com/jero/project/mapper/xml/PayWorkingGroupMapper.xml | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) 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 d6ceae68..779a73b3 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 @@ -220,6 +220,7 @@ public class IndexService { .multiply(new BigDecimal(100)) .setScale(1, RoundingMode.UNNECESSARY); pieChartVO.setValue(String.valueOf(divide)); + pieChartVO.setMoney(String.valueOf(amountClassDTO.getMoney())); pieChartVOS.add(pieChartVO); } return pieChartVOS; diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/PieChartVO.java b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/PieChartVO.java index fe180064..a03d99ca 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/PieChartVO.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/index/vo/PieChartVO.java @@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty; import lombok.Data; import org.jeecgframework.poi.excel.annotation.Excel; +import java.math.BigDecimal; + /** * @author liJiaRao * @date 2022-09-02 11:30 @@ -16,4 +18,6 @@ public class PieChartVO { private String name; @ApiModelProperty(value = "值") private String value; + @ApiModelProperty(value = "金额") + private String money; } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml index 59647184..be188829 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/project/mapper/xml/PayWorkingGroupMapper.xml @@ -2319,6 +2319,6 @@ DATE_FORMAT(pcpr.payment_date, '%Y') like concat(#{year}, '%') - GROUP BY chargeUse; + GROUP BY chargeUse