From 026851fc2b1eef53a48604f8e8fcec6c012b1f13 Mon Sep 17 00:00:00 2001 From: jianjun Date: Tue, 8 Jun 2021 15:20:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/EIDimServiceImpl.java | 36 +++++++++---------- 1 file changed, 16 insertions(+), 20 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java index 0633983ea4..8b5b67fe7d 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/EIDimServiceImpl.java @@ -52,6 +52,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询可更新的单位 + * * @return */ private List listAgencies2Update() { @@ -69,6 +70,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询可增加的单位 + * * @return */ private List listAgencies2Add() { @@ -92,6 +94,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询需要更新的部门列表 + * * @return */ private List listDepts2Update() { @@ -109,6 +112,7 @@ public class EIDimServiceImpl implements EIDimService { /** * 查询需要新增的部门列表 + * * @return */ private List listDepts2Add() { @@ -126,36 +130,28 @@ public class EIDimServiceImpl implements EIDimService { @Override public void initGrids() { List grids2Add = listGrids2Add(); - List grids2Update =listGrids2Update(); + List grids2Update = listGrids2Update(); screenCustomerGridService.addAndUpdateGrids(grids2Add, grids2Update); } @Override - public Map updateCenterPointByName(GridCenterPointForm param) { - //todo 怎么反向判断 左匹配 + public Map updateCenterPointByName(GridCenterPointForm param) { List gridInfos = screenCustomerGridService.selectGridInfoByCustomerId(param.getCustomerId()); - Map result = new HashMap<>(); + Map result = new HashMap<>(); - - gridInfos.forEach(grid->{ + gridInfos.forEach(grid -> { //客户id 和组织id 都相等 且 名字 包含关系时才修改 - if (grid.getCustomerId().equals(param.getCustomerId())){ + if (grid.getCustomerId().equals(param.getCustomerId())) { AtomicInteger integer = new AtomicInteger(0); - param.getCenterDataList().forEach(o ->{ - if (grid.getGridName().contains(o.getTitle())) { - Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), o.getTitle(), o.getCenter()); - integer.addAndGet(effectRow); - } - result.put(grid.getGridId(),integer.intValue()); - }); + param.getCenterDataList().forEach(o -> { + if (grid.getGridName().contains(o.getTitle())) { + Integer effectRow = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(), o.getTitle(), o.getCenter()); + integer.addAndGet(effectRow); + } + result.put(grid.getGridId(), integer.intValue()); + }); } }); - /*param.getCenterDataList().forEach(o ->{ - Integer integer = screenCustomerGridService.updateCenterPointByName(param.getCustomerId(),param.getAgencyId(), o.getTitle(), o.getCenter()); - if (integer == 0 || integer > 1){ - result.put(o.getTitle(),integer); - } - });*/ return result; }