From d6ce456ed8591486ccce92126e7ec8d4841ea4ae Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 13 Jul 2021 15:27:53 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E=20?= =?UTF-8?q?=E8=A1=A5=E5=85=85=E4=B8=8B=E4=B8=8B=E5=8C=BA=E5=8E=BF=E7=BA=A7?= =?UTF-8?q?=E7=9A=84=E5=BE=97=E5=88=86=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datareport/constant/IndexConstant.java | 1 + .../index/impl/IndexExplainServiceImpl.java | 29 ++++++++++++------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java index 244b5f6c18..27facb34f2 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/constant/IndexConstant.java @@ -34,6 +34,7 @@ public class IndexConstant { public static final String INDEX_SCORE_TITLE = "当月指数"; public static final String INDEX_SCORE_DESC = "自然月周期内，当月指数得分(totalScore)=党建指数得分(dangjiannengli)*相关权重(dangjiannengliweight)+治理指数得分(zhilinengli)*相关权重(zhilinengliweight)+服务指数得分(fuwunengli)*相关权重(fuwunengliweight)"; public static final String INDEX_DISTRINCT_TABLE1_INDEX_CODE = "suoyoujiedaozlnlpjz"; + public static final String INDEX_DISTRINCT_TABLE2_INDEX_CODE = "suoyouzhishubmzlnlpjz"; public static final String ZHI_LI_NENG_LI = "zhilinengli"; public static final String PATTERN_D = "d"; public static final String PATTERN_WEIGHT = "weight"; 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 deba53ddb7..cdde8c050d 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 @@ -112,10 +112,18 @@ public class IndexExplainServiceImpl implements IndexExplainService { //全区相关的服务能力的含义中 有权重 所以特殊处理下 if (explainDTO.getOrgLevel().equals(OrgLevelEnum.DISTRICT.getCode()) && IndexConstant.ZLZS_CN.equals(explainDTO.getTitle())) { - List detailResults = detailEntityMap.get(IndexConstant.QUAN_QU_ZHI_LI_INDEX_CODE); - detailResults.forEach(index -> { - String newMeaning = result.getMeaning().replaceFirst(IndexConstant.PATTERN_D, - index.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.ZERO, BigDecimal.ROUND_HALF_UP).toString()); + + //获取分数 补充下 + IndexScoreFormDTO ablityListFormDTO = new IndexScoreFormDTO(); + ablityListFormDTO.setCustomerId(formDTO.getCustomerId()); + ablityListFormDTO.setOrgId(formDTO.getOrgId()); + ablityListFormDTO.setAllParentIndexCode(explainDTO.getIndexCode()); + ablityListFormDTO.setMonthId(StringUtils.isBlank(formDTO.getMonthId()) ? DateUtils.getCurrentTimeBeforeMonthId() : formDTO.getMonthId()); + List scoreResults = agencySubScoreDao.selectSubScore(ablityListFormDTO); + scoreResults.forEach(e->{ + String newMeaning = result.getMeaning().replaceFirst(e.getIndexCode(),e.getScore().toString()) + .replaceFirst(IndexConstant.PATTERN_D, + e.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.ZERO, BigDecimal.ROUND_HALF_UP).toString());; result.setMeaning(newMeaning); }); } @@ -124,7 +132,6 @@ public class IndexExplainServiceImpl implements IndexExplainService { //子节点 setChildren(formDTO, detailEntityMap, result, explainDTO, explainDTO.getChildren()); //设置 新的含义 带分数的 - System.out.println(result.getIndexCode()+"============="); setCurrentMonthScore(formDTO, first,result); } @@ -175,7 +182,7 @@ public class IndexExplainServiceImpl implements IndexExplainService { } firstMeaning = firstMeaning.replaceFirst(indexCode, score.getScore().toString()).replaceFirst(indexCode.concat(IndexConstant.PATTERN_WEIGHT), score.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.ZERO, BigDecimal.ROUND_HALF_UP).toString() + "%"); - if (score.getIndexCode().equals(second.getIndexCode())){ + if (second.getIndexCode().contains(score.getIndexCode())){ secondMeaning = secondMeaning.replaceFirst(IndexConstant.PATTERN_TOTAL, score.getScore().toString()) .replaceFirst(IndexConstant.BEN_JI_EN, score.getSelfScore().toString()) .replaceFirst(IndexConstant.XIA_JI_EN, score.getSubScore().toString()); @@ -235,6 +242,9 @@ public class IndexExplainServiceImpl implements IndexExplainService { List indexGroupDetailEntities = new ArrayList<>(); for (IndexGroupDetailResult index : detailResults) { if (IndexConstant.INDEX_DISTRINCT_TABLE1_INDEX_CODE.equals(index.getIndexCode())) { + String newMeaning = result.getMeaning().replaceFirst(IndexConstant.PATTERN_D, + index.getWeight().multiply(new BigDecimal(NumConstant.ONE_HUNDRED)).setScale(NumConstant.ZERO, BigDecimal.ROUND_HALF_UP).toString()); + result.setMeaning(newMeaning); indexGroupDetailEntities.add(index); setDefaultTableData(orgLevel, type, detailEntityMap, result, allIndexCodePath, indexGroupDetailEntities); //不下钻 @@ -312,14 +322,14 @@ public class IndexExplainServiceImpl implements IndexExplainService { } } - private List setDefaultTableData(String orgLevel, String type, Map> detailEntityMap, - IndexExplainResult result, String allIndexCodePath, List indexGroupDetailEntities) { + private void setDefaultTableData(String orgLevel, String type, Map> detailEntityMap, + IndexExplainResult result, String allIndexCodePath, List indexGroupDetailEntities) { if (indexGroupDetailEntities == null) { indexGroupDetailEntities = detailEntityMap.get(allIndexCodePath); } if (CollectionUtils.isEmpty(indexGroupDetailEntities)) { log.warn("setDefaultTableData allINdexCodePath:{} is config error", allIndexCodePath); - return null; + return; } List tableList = new ArrayList<>(); List threlodList = new ArrayList<>(); @@ -348,7 +358,6 @@ public class IndexExplainServiceImpl implements IndexExplainService { result.setTableDataList(tableList); result.setThresholdList(threlodList); result.setTableDesc(IndexConstant.TABLE_DESC); - return tableList; } private void setChildren(IndexExplainFormDTO formDTO, Map> detailEntityMap, IndexExplainResult result, IndexExplainTreeDTO parentNode, List children) {