From 24536ebcf87ade6eee044a0bf93d3f6f3b75708c Mon Sep 17 00:00:00 2001 From: jianjun Date: Wed, 23 Sep 2020 13:30:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../indexcal/FactIndexAgencySelfSubScoreDao.java | 4 ++-- .../indexcal/impl/GridCorreLationServiceImpl.java | 15 +++++++++++++-- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/FactIndexAgencySelfSubScoreDao.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/FactIndexAgencySelfSubScoreDao.java index af290b9ca6..be0033d735 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/FactIndexAgencySelfSubScoreDao.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/FactIndexAgencySelfSubScoreDao.java @@ -18,7 +18,7 @@ package com.epmet.dao.evaluationindex.indexcal; import com.epmet.commons.mybatis.dao.BaseDao; -import com.epmet.entity.evaluationindex.indexcal.FactIndexAgencySelfSubScoreEntity; +import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity; import org.apache.ibatis.annotations.Mapper; /** @@ -28,6 +28,6 @@ import org.apache.ibatis.annotations.Mapper; * @since v1.0.0 2020-09-21 */ @Mapper -public interface FactIndexAgencySelfSubScoreDao extends BaseDao { +public interface FactIndexAgencySelfSubScoreDao extends BaseDao { } \ No newline at end of file diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java index d4fc251cdb..2037c86fb1 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/indexcal/impl/GridCorreLationServiceImpl.java @@ -19,6 +19,7 @@ import com.epmet.dao.evaluationindex.screen.IndexGroupDetailDao; import com.epmet.dao.evaluationindex.screen.ScreenCustomerGridDao; import com.epmet.dto.ScreenCustomerGridDTO; import com.epmet.dto.indexcal.*; +import com.epmet.entity.evaluationindex.indexcal.AgencySelfSubScoreEntity; import com.epmet.entity.evaluationindex.indexcal.GridScoreEntity; import com.epmet.entity.evaluationindex.indexcal.GridSubScoreEntity; import com.epmet.entity.evaluationindex.screen.IndexGroupDetailEntity; @@ -121,8 +122,18 @@ public class GridCorreLationServiceImpl implements GridCorreLationService { log.error("calculateSelfSubScore gridSubScoreDao.selectSubListByPath return empty，customerId:{} ", formDTO.getCustomerId()); return; } - selfSubIndexList.forEach(score -> { - + Map selfSubParentMap = new HashMap<>(); + selfSubIndexList.forEach(o -> { + //找出自身 和下级的指标 + if (o.getAllParentIndexCode().contains("xiaji")) { + selfSubParentMap.put(o.getAllParentIndexCode(), "xiaji"); + } else { + selfSubParentMap.put(o.getAllParentIndexCode(), "zishen"); + } + }); + Map insertList = new HashMap<>(); + subScore.forEach(score -> { + insertList.get(score.getAllParentIndexCode()); }); }); }