add 收入分类统计 未收账款统计 增加总数

db/22年7月变更.sql

@@ -37,7 +37,7 @@ ALTER TABLE `pay_case_committee` add COLUMN `principal_id_a` varchar (50) CHARAC
 ALTER TABLE `pay_case_committee` add COLUMN `principal_name_a` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人名称A' ;
 ALTER TABLE `pay_case_committee` add COLUMN `principal_id_b` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人Bid' ;
 ALTER TABLE `pay_case_committee` add COLUMN `principal_name_b` varchar (50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL COMMENT '负责人名称B' ;
---20220714 问题征集字典
+-- 20220714 问题征集字典
 INSERT INTO sys_dict ( id, dict_name, dict_code, description, del_flag, create_by, create_time ) VALUES ( '1547479075568955393', '问题征集状态', 'questionStatue', '问题征集状态', 0, 'LKGLZ', '2022-07-14 15:12:17' );
 INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1547479215562240001', '1547479075568955393', '已结束', '0', '已结束', 1, 1, 'LKGLZ', '2022-07-14 15:12:50' );
 INSERT INTO sys_dict_item ( id, dict_id, item_text, item_value, description, sort_order, status, create_by, create_time ) VALUES ( '1547479261783470082', '1547479075568955393', '征集中', '1', '', 1, 1, 'LKGLZ', '2022-07-14 15:13:01' );

jero-boot-incoming-payment/src/main/java/com/jero/index/contoller/IndexController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.List;
 import java.util.Objects;
 
@@ -99,8 +100,8 @@ public class IndexController {
     @ApiOperation(value = "未收账款统计")
     @GetMapping(value = "/uncollected")
     public Result<List<UncollectedPieChartVO>> uncollected(@RequestParam(name="departCode",required = false)String departCode) {
-        List<UncollectedPieChartVO> UncollectedPieChartVOS = indexService.uncollected(departCode);
-        return Result.OK(UncollectedPieChartVOS);
+        List<UncollectedPieChartVO> uncollectedPieChartVOS = indexService.uncollected(departCode);
+        return Result.OK(uncollectedPieChartVOS);
     }
 
 }

jero-boot-incoming-payment/src/main/java/com/jero/index/service/IndexService.java

@@ -248,6 +248,12 @@ public class IndexService {
             pieChartVO.setMoney(String.valueOf(money));
             pieChartVOS.add(pieChartVO);
         }
+        //总数
+        BigDecimal reduce = pieChartVOS.stream().map(i -> new BigDecimal(i.getMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
+        PieChartVO pieChartVO = new PieChartVO();
+        pieChartVO.setName("总数");
+        pieChartVO.setMoney(String.valueOf(reduce));
+        pieChartVOS.add(pieChartVO);
         return pieChartVOS;
     }
 
@@ -276,6 +282,12 @@ public class IndexService {
         uncollectedPieChartVOList.add(uncollectedPieChartVO3);
         UncollectedPieChartVO uncollectedPieChartVO4 = setUncollectedPieChartVO("一年以上", 361, null, departCode);
         uncollectedPieChartVOList.add(uncollectedPieChartVO4);
+        //总数
+        BigDecimal reduce = uncollectedPieChartVOList.stream().map(i -> new BigDecimal(i.getMoney())).reduce(BigDecimal.ZERO, BigDecimal::add);
+        UncollectedPieChartVO uncollectedPieChartVO = new UncollectedPieChartVO();
+        uncollectedPieChartVO.setName("总数");
+        uncollectedPieChartVO.setMoney(String.valueOf(reduce));
+        uncollectedPieChartVOList.add(uncollectedPieChartVO);
         return uncollectedPieChartVOList;
     }