diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java index 9a0aa33..138ed68 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/BizUtils.java @@ -130,8 +130,11 @@ public class BizUtils { } public static String computeRise(Integer numa, Integer numb) { - if(Objects.isNull(numa) || Objects.isNull(numb) || numa.equals(0) || numb.equals(0)){ - return "0"; + if(Objects.isNull(numa) || numa.equals(0)){ + return "-100"; + } + if(Objects.isNull(numb)|| numb.equals(0)){ + return "100"; } return BigDecimal.valueOf((numa - numb) * 100.0).divide(BigDecimal.valueOf(numb),2, RoundingMode.CEILING) .stripTrailingZeros().toPlainString(); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java index 08b2c52..2987dce 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java @@ -102,7 +102,7 @@ public class CockpitStatsStatisticsTask { StopWatch stopWatch = new StopWatch(); stopWatch.start(); - List years = Lists.newArrayList(2021,2022,2023,2024); + List years = Lists.newArrayList(2021,2022,2023,2024,2025); List res = Lists.newArrayList(); //1.根据2个维度来统计 区域和分年 @@ -507,13 +507,13 @@ public class CockpitStatsStatisticsTask { } cockpitStats.setMonitorOverdueConstructionProjectsRise(BizUtils.computeRise(thisYearData.getMonitorOverdueConstructionProjectsNum(), lastYearData.getMonitorOverdueConstructionProjectsNum())); - cockpitStats.setMonitorLaggingProjectsRise(BizUtils.computeRise(thisYearData.getMonitorOverdueConstructionProjectsNum(), - lastYearData.getMonitorOverdueConstructionProjectsNum())); - cockpitStats.setMonitorRejectedApproveProjectsRise(BizUtils.computeRise(thisYearData.getMonitorOverdueConstructionProjectsNum(), - lastYearData.getMonitorOverdueConstructionProjectsNum())); - cockpitStats.setMonitorRejectedPreReviewProjectsRise(BizUtils.computeRise(thisYearData.getMonitorOverdueConstructionProjectsNum(), - lastYearData.getMonitorOverdueConstructionProjectsNum())); - cockpitStats.setMonitorAcceptConditionsNotStandardsRise(BizUtils.computeRise(thisYearData.getMonitorOverdueConstructionProjectsNum(), - lastYearData.getMonitorOverdueConstructionProjectsNum())); + cockpitStats.setMonitorLaggingProjectsRise(BizUtils.computeRise(thisYearData.getMonitorLaggingProjectsNum(), + lastYearData.getMonitorLaggingProjectsNum())); + cockpitStats.setMonitorRejectedApproveProjectsRise(BizUtils.computeRise(thisYearData.getMonitorRejectedApproveProjectsNum(), + lastYearData.getMonitorRejectedApproveProjectsNum())); + cockpitStats.setMonitorRejectedPreReviewProjectsRise(BizUtils.computeRise(thisYearData.getMonitorRejectedPreReviewProjectsNum(), + lastYearData.getMonitorRejectedPreReviewProjectsNum())); + cockpitStats.setMonitorAcceptConditionsNotStandardsRise(BizUtils.computeRise(thisYearData.getMonitorAcceptConditionsNotStandardsNum(), + lastYearData.getMonitorAcceptConditionsNotStandardsNum())); } }