add 收入分类统计返回值增加金额

This commit is contained in:
lijiarao
2022-09-03 09:37:25 +08:00
parent 38b3081f3c
commit 5a024fcc5f
3 changed files with 6 additions and 1 deletions
@@ -220,6 +220,7 @@ public class IndexService {
.multiply(new BigDecimal(100)) .multiply(new BigDecimal(100))
.setScale(1, RoundingMode.UNNECESSARY); .setScale(1, RoundingMode.UNNECESSARY);
pieChartVO.setValue(String.valueOf(divide)); pieChartVO.setValue(String.valueOf(divide));
pieChartVO.setMoney(String.valueOf(amountClassDTO.getMoney()));
pieChartVOS.add(pieChartVO); pieChartVOS.add(pieChartVO);
} }
return pieChartVOS; return pieChartVOS;
@@ -5,6 +5,8 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data; import lombok.Data;
import org.jeecgframework.poi.excel.annotation.Excel; import org.jeecgframework.poi.excel.annotation.Excel;
import java.math.BigDecimal;
/** /**
* @author liJiaRao * @author liJiaRao
* @date 2022-09-02 11:30 * @date 2022-09-02 11:30
@@ -16,4 +18,6 @@ public class PieChartVO {
private String name; private String name;
@ApiModelProperty(value = "值") @ApiModelProperty(value = "值")
private String value; private String value;
@ApiModelProperty(value = "金额")
private String money;
} }
@@ -2319,6 +2319,6 @@
<where> <where>
DATE_FORMAT(pcpr.payment_date, '%Y') like concat(#{year}, '%') DATE_FORMAT(pcpr.payment_date, '%Y') like concat(#{year}, '%')
</where> </where>
GROUP BY chargeUse; GROUP BY chargeUse
</select> </select>
</mapper> </mapper>