From 48103d32f82b8fae2e4afb4d1164e515ef79a19a Mon Sep 17 00:00:00 2001 From: jianjun Date: Thu, 27 May 2021 11:16:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B3=E5=9D=87=E5=80=BC=E6=95=B0=E9=87=8F?= =?UTF-8?q?=20=E4=B8=8D=E6=A0=BC=E5=BC=8F=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../index/impl/IndexExplainServiceImpl.java | 59 ++++++++++--------- 1 file changed, 31 insertions(+), 28 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java index 77252eb6ad..4ade8e04b0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/index/impl/IndexExplainServiceImpl.java @@ -219,27 +219,29 @@ public class IndexExplainServiceImpl implements IndexExplainService { } } else { tb.setOriginValue(score.getOriginValue()); - } - - - //小数类型，四舍五入保留小数点后一位 - if (FactConstant.INTEGER.equals(score.getValueType())) { - BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP); - tb.setOriginValue(num.toString()); - } - if (FactConstant.DECIMAL.equals(score.getValueType())) { - BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP); - tb.setOriginValue(num.toString()); - } - //百分数类型，四舍五入保留小数点后一位并转成百分比 - if (FactConstant.PERCENT.equals(score.getValueType())) { - BigDecimal num = new BigDecimal(tb.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP); - tb.setOriginValue(num + "%"); + formatOriginValue(score, tb); } } } } + private void formatOriginValue(IndexScoreResult score, IndexScoreDetailResult index) { + //小数类型，四舍五入保留小数点后一位 + if (FactConstant.INTEGER.equals(score.getValueType())) { + BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(0, BigDecimal.ROUND_HALF_UP); + index.setOriginValue(num.toString()); + } + if (FactConstant.DECIMAL.equals(score.getValueType())) { + BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP); + index.setOriginValue(num.toString()); + } + //百分数类型，四舍五入保留小数点后一位并转成百分比 + if (FactConstant.PERCENT.equals(score.getValueType())) { + BigDecimal num = new BigDecimal(index.getOriginValue()).setScale(1, BigDecimal.ROUND_HALF_UP); + index.setOriginValue(num + "%"); + } + } + private List setDefaultTableData(String orgLevel, String type, Map> detailEntityMap, IndexExplainResult result, String allIndexCodePath, List indexGroupDetailEntities) { if (indexGroupDetailEntities == null) { @@ -253,13 +255,13 @@ public class IndexExplainServiceImpl implements IndexExplainService { List threlodList = new ArrayList<>(); indexGroupDetailEntities.forEach(index -> { IndexScoreDetailResult table = new IndexScoreDetailResult(); - if ("grid".equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) { + if (OrgLevelEnum.GRID.equals(orgLevel) && IndexConstant.ZI_SHEN.equals(type) && index.getAllIndexCodePath().contains(IndexConstant.XIA_JI)) { return; } - if ("district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) { + if (OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type) && !index.getAllIndexCodePath().contains(IndexConstant.ZHI_LI_NENG_LI)) { return; } - if (!"grid".equals(orgLevel) && !"district".equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) { + if (!OrgLevelEnum.GRID.equals(orgLevel) && !OrgLevelEnum.DISTRICT.equals(orgLevel) && !index.getAllIndexCodePath().contains(type)) { return; } table.setIndexCode(index.getIndexCode()); @@ -300,13 +302,14 @@ public class IndexExplainServiceImpl implements IndexExplainService { private List getTableHeaders(String type, String allIndexCode, String orgLevel) { List headers = new ArrayList<>(); - switch (orgLevel) { - case "grid": + OrgLevelEnum anEnum = OrgLevelEnum.getEnum(orgLevel); + switch (anEnum) { + case GRID: //还没确定怎么搞 - if ("zishen".equals(type)) { + if (IndexConstant.ZI_SHEN.equals(type)) { headers = IndexConstant.getStandardSelfHeaders(allIndexCode); - } else if ("xiaji".equals(type)) { + } else if (IndexConstant.XIA_JI.equals(type)) { headers = new ArrayList<>(IndexConstant.QuantityLastHeader); if (allIndexCode.contains("canyuyishi")) { headers.add(0, "组织内党员的参与议事指数考评分（平均值）"); @@ -315,11 +318,11 @@ public class IndexExplainServiceImpl implements IndexExplainService { } break; } - case "district": - if ("zishen".equals(type)) { + case DISTRICT: + if (IndexConstant.ZI_SHEN.equals(type)) { headers = IndexConstant.getStandardSelfHeaders(allIndexCode); - } else if ("xiaji".equals(type)) { + } else if (IndexConstant.XIA_JI.equals(type)) { headers = new ArrayList<>(IndexConstant.QuantityLastHeader); if (allIndexCode.contains("quzhibumen")) { headers.add(0, "区直部门各项治理指数指标"); @@ -329,10 +332,10 @@ public class IndexExplainServiceImpl implements IndexExplainService { } break; default: - if ("zishen".equals(type)) { + if (IndexConstant.ZI_SHEN.equals(type)) { headers = IndexConstant.getStandardSelfHeaders(allIndexCode); - } else if ("xiaji".equals(type)) { + } else if (IndexConstant.XIA_JI.equals(type)) { headers = IndexConstant.getStandardSubHeaders(allIndexCode); } }