From 698eaa41da3bf95edfb86cf8d49a2ea7d20fd704 Mon Sep 17 00:00:00 2001 From: lc <15038716315@163.com> Date: Fri, 21 Jun 2024 09:14:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=81=E4=B8=9A=E4=BF=A1=E6=81=AF=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=20=E6=9F=A5=E8=AF=A2=E4=BC=81=E4=B8=9A=E5=AD=A3?= =?UTF-8?q?=E5=BA=A6=E6=B3=A8=E5=86=8C=E6=95=B0=E8=BF=94=E5=9B=9E=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E6=9C=88=E4=BB=BD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../EnterpriseInformationController.java | 6 +- .../EnterpriseInformationService.java | 2 +- .../EnterpriseInformationServiceImpl.java | 70 +++++++++++++++++-- 3 files changed, 70 insertions(+), 8 deletions(-) diff --git a/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/controller/admin/enterpriseinformation/EnterpriseInformationController.java b/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/controller/admin/enterpriseinformation/EnterpriseInformationController.java index 2bfe45c..48f85ab 100644 --- a/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/controller/admin/enterpriseinformation/EnterpriseInformationController.java +++ b/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/controller/admin/enterpriseinformation/EnterpriseInformationController.java @@ -116,9 +116,9 @@ public class EnterpriseInformationController { @GetMapping("/selectEnterpriseByQuarter") @Operation(summary = "查询平台企业季度注册数") - public CommonResult> selectEnterpriseByQuarter(){ - Map stringLongMap = enterpriseInformationService.selectEnterpriseByQuarter(); - return success(stringLongMap); + public CommonResult> selectEnterpriseByQuarter(){ + List statisticsResultData = enterpriseInformationService.selectEnterpriseByQuarter(); + return success(statisticsResultData); } @GetMapping("/selectEnterpriseByMonth") diff --git a/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationService.java b/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationService.java index 86a6fca..09426a0 100644 --- a/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationService.java +++ b/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationService.java @@ -95,7 +95,7 @@ public interface EnterpriseInformationService { * 查询平台企业季度注册数 * @return */ - Map selectEnterpriseByQuarter(); + List selectEnterpriseByQuarter(); /** * 查询平台企业月度注册数 diff --git a/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationServiceImpl.java b/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationServiceImpl.java index e1035bb..93755e4 100644 --- a/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationServiceImpl.java +++ b/yudao-module-fta/yudao-module-fta-biz/src/main/java/cn/iocoder/yudao/module/fta/service/enterpriseinformation/EnterpriseInformationServiceImpl.java @@ -283,7 +283,7 @@ public class EnterpriseInformationServiceImpl implements EnterpriseInformationSe * @return */ @Override - public Map selectEnterpriseByQuarter() { + public List selectEnterpriseByQuarter() { List enterpriseInformationDOS = enterpriseInformationMapper.selectList(); // 按季度分组并计算企业数量 Map quarterlyCounts = enterpriseInformationDOS.stream() @@ -292,8 +292,63 @@ public class EnterpriseInformationServiceImpl implements EnterpriseInformationSe ((enterprise.getCreateTime().getMonthValue() - 1) / 3 + 1), // 季度计算 Collectors.counting() )); - return quarterlyCounts; + LocalDate today = LocalDate.now(); + int year = today.getYear();//当前年份 + Map filteredCounts = quarterlyCounts.entrySet().stream() + .filter(entry -> entry.getKey().contains(year+"")) + .collect(Collectors.toMap( + entry -> entry.getKey().substring(5), + Map.Entry::getValue + )); + List list = new ArrayList<>(); + extracted(filteredCounts, list); + return list; } + + /** + * 处理季度注册数据 + * @param filteredCounts + * @param list + */ + private static void extracted(Map filteredCounts, List list) { + StatisticsResultData quarterOne = new StatisticsResultData(); + quarterOne.setName("第一季度"); + if(filteredCounts.containsKey("1")){ + quarterOne.setValue(filteredCounts.get("1")); + }else { + quarterOne.setValue(0L); + } + + StatisticsResultData quarterTwo = new StatisticsResultData(); + quarterTwo.setName("第二季度"); + if(filteredCounts.containsKey("2")){ + quarterTwo.setValue(filteredCounts.get("2")); + }else { + quarterTwo.setValue(0L); + } + + StatisticsResultData quarterThree = new StatisticsResultData(); + quarterThree.setName("第三季度"); + if(filteredCounts.containsKey("3")){ + quarterThree.setValue(filteredCounts.get("3")); + }else { + quarterThree.setValue(0L); + } + + StatisticsResultData quarterFour = new StatisticsResultData(); + quarterFour.setName("第四季度"); + if(filteredCounts.containsKey("4")){ + quarterFour.setValue(filteredCounts.get("4")); + }else { + quarterFour.setValue(0L); + } + + list.add(quarterOne); + list.add(quarterTwo); + list.add(quarterThree); + list.add(quarterFour); + } + /** * 查询平台企业月度注册数 * @return @@ -317,7 +372,16 @@ public class EnterpriseInformationServiceImpl implements EnterpriseInformationSe Map.Entry::getValue )); List list = new ArrayList<>(); + disposeMonthData(filteredCounts, list); + return list; + } + /** + * 处理月度注册数据 + * @param filteredCounts + * @param list + */ + private static void disposeMonthData(Map filteredCounts, List list) { StatisticsResultData january = new StatisticsResultData(); january.setName("analysis.january"); if(filteredCounts.containsKey("1")){ @@ -426,8 +490,6 @@ public class EnterpriseInformationServiceImpl implements EnterpriseInformationSe list.add(october); list.add(november); list.add(december); - - return list; } /**