From a34ee9fa8d46445e88b9cbbe9a53e8ae5b1e3248 Mon Sep 17 00:00:00 2001 From: yinzuomei <576302893@qq.com> Date: Fri, 9 Jul 2021 20:56:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=8E=9F=E6=9D=A5=E6=98=AF=E5=8F=96?= =?UTF-8?q?=E5=8F=8D=E4=BA=86=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../screen/impl/ShiBeiScreenCollServiceImpl.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java index 0982493cb5..3b96365fbe 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java @@ -395,12 +395,12 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService { for (int j = NumConstant.ZERO; j < lastMonthJoinList.size(); j++) { if (formDTO.getDataList().get(i).getOrgId().equals(lastMonthJoinList.get(j).getOrgId())) { ScreenUserJoinEntity entity = ConvertUtils.sourceToTarget(formDTO.getDataList().get(i), ScreenUserJoinEntity.class); - entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getJoinTotal(), formDTO.getDataList().get(j).getJoinTotal())); - entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getJoinTotal(), formDTO.getDataList().get(j).getJoinTotal())); - entity.setAvgIssueUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgIssue(), formDTO.getDataList().get(j).getAvgIssue())); - entity.setAvgIssueUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgIssue(), formDTO.getDataList().get(j).getAvgIssue())); - entity.setAgvgJoinUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(i).getAvgJoin(), formDTO.getDataList().get(j).getAvgJoin())); - entity.setAgvgJoinUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(i).getAvgJoin(), formDTO.getDataList().get(j).getAvgJoin())); + entity.setJoinTotalUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(j).getJoinTotal(), formDTO.getDataList().get(i).getJoinTotal())); + entity.setJoinTotalUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(j).getJoinTotal(), formDTO.getDataList().get(i).getJoinTotal())); + entity.setAvgIssueUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(j).getAvgIssue(), formDTO.getDataList().get(i).getAvgIssue())); + entity.setAvgIssueUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(j).getAvgIssue(), formDTO.getDataList().get(i).getAvgIssue())); + entity.setAgvgJoinUpRate(this.calculateGrowthRateNumber(lastMonthJoinList.get(j).getAvgJoin(), formDTO.getDataList().get(i).getAvgJoin())); + entity.setAgvgJoinUpFlag(this.calculateGrowthRateFlag(lastMonthJoinList.get(j).getAvgJoin(), formDTO.getDataList().get(i).getAvgJoin())); curMonthJoinEntityList.add(entity); } } From 95bc6794189f6319ad5f7366e6d6c7d3b87883eb Mon Sep 17 00:00:00 2001 From: jianjun Date: Fri, 9 Jul 2021 21:26:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8Ebug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extract/toscreen/impl/PublicPartExtractServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java index f15ac13f4e..9bae1a2869 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java @@ -582,14 +582,14 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService { l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin(),NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP)); } } else if (avgJoinRe.equals(NumConstant.ONE_NEG)) { - l.setAvgIssueUpFlag(GovernConstant.DECR); + l.setAgvgJoinUpFlag(GovernConstant.DECR); if (s.getAvgJoin().compareTo(NumConstant.ZERO_DECIMAL) == 0){ l.setAgvgJoinUpRate(NumConstant.ONE_HUNDRED_DECIMAL); }else { l.setAgvgJoinUpRate(l.getAvgJoin().subtract(s.getAvgJoin()).divide(s.getAvgJoin(),NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP).multiply(NumConstant.ONE_HUNDRED_DECIMAL).setScale(NumConstant.FOUR, BigDecimal.ROUND_HALF_UP)); } } else { - l.setAvgIssueUpFlag(GovernConstant.EQ); + l.setAgvgJoinUpFlag(GovernConstant.EQ); l.setAgvgJoinUpRate(NumConstant.ZERO_DECIMAL); } }