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