From e9eb500323b5c4cd127e019378d12beaa945143f Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 10 Sep 2020 16:00:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=88=E5=80=BC=E4=BF=9D=E5=AD=98=20%?= =?UTF-8?q?=E5=8F=B7=E5=89=8D=E9=9D=A2=E7=9A=84=E6=95=B0=E5=AD=97=EF=BC=9B?= =?UTF-8?q?=E5=85=9A=E5=91=98=E6=80=BB=E5=88=86=E7=9A=84pid=E4=B8=BA0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/epmet/model/IndexExcelDataListener.java | 2 +- .../indexcal/impl/CpcIndexCalculateServiceImpl.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java index b172852d63..57eead6c35 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/model/IndexExcelDataListener.java @@ -92,7 +92,7 @@ public class IndexExcelDataListener extends AnalysisEventListener { threshold = "-1"; } else if (data.getThreshold().contains("%")) { String thresholdStr = data.getThreshold().replace("%", ""); - threshold = new BigDecimal(thresholdStr).divide(new BigDecimal(100), 4, RoundingMode.HALF_UP).toString(); + threshold = new BigDecimal(thresholdStr).toString(); } data.setThreshold(threshold); } diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java index d7d1beb909..610b6c51aa 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/CpcIndexCalculateServiceImpl.java @@ -100,7 +100,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService { totalEntity.setIsTotal(NumConstant.ONE_STR); totalEntity.setIndexCode(IndexCodeEnum.DANG_YUAN_XIANG_GUAN.getCode()); totalEntity.setScore(new BigDecimal(NumConstant.ZERO)); - totalEntity.setAllParentIndexCode(indexGroupDetailEntity.getAllParentIndexCode()); + totalEntity.setAllParentIndexCode(NumConstant.ZERO_STR); cpcScoreTotalMap.put(userId, totalEntity); } //自建群活跃度——议题转项目率 有阈值 >60%按60%算