From 40dd58b8cab8ed697996ece9bb2e9b6e0630f24a Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 13:49:52 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9C=88=E5=BA=A6?= =?UTF-8?q?=E6=8C=87=E6=95=B0=E5=BE=97=E5=88=86=E6=80=BB=E5=88=86=E4=BD=BF?= =?UTF-8?q?=E7=94=A8=E7=B4=AF=E5=8A=A0=E5=92=8C=E6=96=B9=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluationindex/screen/impl/IndexServiceImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 5fee90fb73..1effbe941f 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -285,8 +285,6 @@ public class IndexServiceImpl implements IndexService { NumberFormat nf = NumberFormat.getPercentInstance(); nf.setMaximumFractionDigits(1); - BigDecimal num = new BigDecimal(resultDTO.getTotal()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros(); - resultDTO.setTotalScore(num); BigDecimal num1 = new BigDecimal(resultDTO.getParty()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros(); resultDTO.setPartyDevAbility(num1); resultDTO.setPartyDevAbilityWeight(nf.format(Double.parseDouble(resultDTO.getPartyDevAbilityWeight()))); @@ -296,6 +294,9 @@ public class IndexServiceImpl implements IndexService { BigDecimal num3 = new BigDecimal(resultDTO.getService()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros(); resultDTO.setServiceAbility(num3); resultDTO.setServiceAbilityWeight(nf.format(Double.parseDouble(resultDTO.getServiceAbilityWeight()))); + Double db = Double.parseDouble(resultDTO.getParty())+Double.parseDouble(resultDTO.getGovern())+Double.parseDouble(resultDTO.getService()); + BigDecimal num = new BigDecimal(db.toString()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros(); + resultDTO.setTotalScore(num); return resultDTO; } From 66d5818b42d43da18b045c3b907ba8b325a053e4 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Mon, 12 Oct 2020 14:16:32 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=A8=8B=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/evaluationindex/screen/impl/IndexServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java index 1effbe941f..01b433dc0d 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/IndexServiceImpl.java @@ -294,7 +294,7 @@ public class IndexServiceImpl implements IndexService { BigDecimal num3 = new BigDecimal(resultDTO.getService()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros(); resultDTO.setServiceAbility(num3); resultDTO.setServiceAbilityWeight(nf.format(Double.parseDouble(resultDTO.getServiceAbilityWeight()))); - Double db = Double.parseDouble(resultDTO.getParty())+Double.parseDouble(resultDTO.getGovern())+Double.parseDouble(resultDTO.getService()); + Double db = num1.doubleValue() + num2.doubleValue() + num3.doubleValue(); BigDecimal num = new BigDecimal(db.toString()).setScale(1, BigDecimal.ROUND_HALF_UP).stripTrailingZeros(); resultDTO.setTotalScore(num);