From e3e33c0b7fa9cc83a87fc0180ccad140a8f9dfd6 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Fri, 17 Dec 2021 13:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E8=83=A1=E7=A7=91=E5=AE=B6=E8=A6=81?= =?UTF-8?q?=E6=B1=82=E5=B0=86=E5=B9=B3=E9=98=B4=E4=B9=8B=E5=89=8D=E5=B1=85?= =?UTF-8?q?=E6=B0=91=E7=AB=AF=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=BD=91=E6=A0=BC=E5=91=98=E7=9A=84=E5=9C=A8=E6=94=B9?= =?UTF-8?q?=E5=9B=9E=E5=8E=BB=EF=BC=8C=E5=89=8D=E6=9C=9F=E8=A6=81=E6=B1=82?= =?UTF-8?q?=E6=94=B9=E7=9A=84=E6=98=AF=E8=83=A1=E5=B0=8F=E9=9B=B7=E3=80=81?= =?UTF-8?q?=E6=9E=97=E4=BC=9F=E4=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/impl/UserAnalysisServiceImpl.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java index 7e7e2864dd..7b6e81d2e0 100644 --- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java +++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/user/impl/UserAnalysisServiceImpl.java @@ -200,13 +200,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { logger.info("机关名："+m.getName()+",总数="+m.getTotal()); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { dimList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -333,13 +334,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { logger.info("网格名："+m.getName()+",总数="+m.getTotal()); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { dimList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -507,13 +509,14 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { resultList.add(party); } //2021.5.25 平音客户热心居民改网格员 sun start - if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + //2021.121.17 应胡科家要求在改回去 + /*if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { resultList.forEach(d->{ if("热心居民".equals(d.getType())){ d.setType("网格员"); } }); - } + }*/ //2021.5.25 平音客户热心居民改网格员 sun end return resultList; }