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 4daa9e282d..b4a69d462b 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 @@ -443,16 +443,20 @@ public class IndexExplainServiceImpl implements IndexExplainService { @Override public List dplist(HistoryScoreListFormDTO formDTO) { //按条件查询数据,并做加和取平均值操作 - List resultList = indexExplainDao.selectDpList(formDTO); - Map map = new HashMap<>(); - map.put("1258587398679126017","榆山街道");map.put("1215437824174608386","锦水街道"); - map.put("f8d4a6af53b3fc5991ab1434b6ad39b8","东阿镇");map.put("d20a7488eedf5bcfd5231c3771bc0e3d","玫瑰镇"); - map.put("ea78a8e9252f567517c4a8d60250c714","安城镇");map.put("1234085031077498881","孔村镇"); - map.put("f279343a67653fc20d8333c6b2e4dbee","孝直镇");map.put("c259c3b1d27f960b9b379fb2886179ba","洪范池镇"); - resultList.forEach(re->{ + List resultList = indexExplainDao.selectDpList(formDTO); + Map map = new HashMap<>(); + map.put("1258587398679126017", "榆山街道"); + map.put("1215437824174608386", "锦水街道"); + map.put("f8d4a6af53b3fc5991ab1434b6ad39b8", "东阿镇"); + map.put("d20a7488eedf5bcfd5231c3771bc0e3d", "玫瑰镇"); + map.put("ea78a8e9252f567517c4a8d60250c714", "安城镇"); + map.put("1234085031077498881", "孔村镇"); + map.put("f279343a67653fc20d8333c6b2e4dbee", "孝直镇"); + map.put("c259c3b1d27f960b9b379fb2886179ba", "洪范池镇"); + resultList.forEach(re -> { map.remove(re.getAgencyId()); }); - for (String ma : map.keySet()){ + for (String ma : map.keySet()) { HistoryScoreDetailResultDTO.Detail detail = new HistoryScoreDetailResultDTO.Detail(); detail.setAgencyId(ma); detail.setAgencyName(map.get(ma)); @@ -461,3 +465,5 @@ public class IndexExplainServiceImpl implements IndexExplainService { return resultList; } + +}