From 96b03953c1ccb130b0f98601c4e64cd41bf6bdb1 Mon Sep 17 00:00:00 2001 From: lijiarao Date: Fri, 21 Oct 2022 16:51:27 +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=20=E6=9C=AA=E6=94=B6=E8=B4=A6=E6=AC=BE?= =?UTF-8?q?=E7=BB=9F=E8=AE=A1=20=E5=A2=9E=E5=8A=A0=E6=80=BB=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/22年7月变更.sql | 2 +- .../com/jero/index/contoller/IndexController.java | 5 +++-- .../java/com/jero/index/service/IndexService.java | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/db/22年7月变更.sql b/db/22年7月变更.sql index f2f98a2d..c4cb6521 100644 --- a/db/22年7月变更.sql +++ b/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' ); 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 fe787531..5918fe44 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 @@ -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> uncollected(@RequestParam(name="departCode",required = false)String departCode) { - List UncollectedPieChartVOS = indexService.uncollected(departCode); - return Result.OK(UncollectedPieChartVOS); + List uncollectedPieChartVOS = indexService.uncollected(departCode); + return Result.OK(uncollectedPieChartVOS); } } 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 c4ccf2ec..6bd2de33 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 @@ -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; }