From f9262eedd37b977091d3e488d966929d27b56e9f Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Fri, 2 Sep 2022 15:01:36 +0800
Subject: [PATCH] =?UTF-8?q?add=20=E9=A6=96=E9=A1=B5=E7=BB=9F=E8=AE=A1-?=
 =?UTF-8?q?=E3=80=8B=20=E6=94=B6=E5=85=A5=E5=88=86=E7=B1=BB=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/index/contoller/IndexController.java | 24 ++++++++++---------
 1 file changed, 13 insertions(+), 11 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 f3ef28a3..bad96088 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
@@ -2,6 +2,7 @@ package com.jero.index.contoller;
 
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.DictPoint;
+import com.jero.common.exception.JeroBootException;
 import com.jero.index.service.IndexService;
 import com.jero.index.vo.HistogramVO;
 import com.jero.index.vo.LineChartListVO;
@@ -12,10 +13,12 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author liJiaRao
@@ -64,20 +67,19 @@ public class IndexController {
         return Result.OK(histogramVOS);
     }
 
-    @DictPoint
-    @ApiOperation(value = "总金额分类统计")
-    @GetMapping(value = "/totalAmountClassificationStatistics")
-    public Result<List<PieChartVO>> totalAmountClassificationStatistics() {
-        List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney");
-        return Result.OK(pieChartVOS);
-    }
-
     @DictPoint
     @ApiOperation(value = "收入分类统计")
     @GetMapping(value = "/incomeClassificationStatistics")
-    public Result<List<PieChartVO>> incomeClassificationStatistics() {
-        List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("confirmAmount");
-        return Result.OK(pieChartVOS);
+    public Result<List<PieChartVO>> incomeClassificationStatistics(@RequestParam(name="type", defaultValue = "1")Integer type) {
+        if (Objects.equals(type,1)){
+            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("allMoney");
+            return Result.OK(pieChartVOS);
+        }else if (Objects.equals(type,2)){
+            List<PieChartVO> pieChartVOS = indexService.totalAmountClassificationStatistics("confirmAmount");
+            return Result.OK(pieChartVOS);
+        }else {
+            return Result.OK();
+        }
     }
 
     @ApiOperation(value = "前十统计")