diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java index 41302f5e32..25cfa3e0b2 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/StrConstant.java @@ -82,5 +82,8 @@ public interface StrConstant { String MAX="MAX"; + //青岛体悟实训客户 String SPECIAL_CUSTOMER = "150282ed25c14ff0785e7e06283b6283"; + //平音客户 + String PY_CUSTOMER = "6f203e30de1a65aab7e69c058826cd80"; } 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 c4bf48603a..7e7e2864dd 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 @@ -199,6 +199,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { for(UserSubAgencyResultDTO m:dimList){ logger.info("机关名:"+m.getName()+",总数="+m.getTotal()); } + //2021.5.25 平音客户热心居民改网格员 sun start + if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + dimList.forEach(d->{ + if("热心居民".equals(d.getType())){ + d.setType("网格员"); + } + }); + } + //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -323,6 +332,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { for(UserSubGridResultDTO m:dimList){ logger.info("网格名:"+m.getName()+",总数="+m.getTotal()); } + //2021.5.25 平音客户热心居民改网格员 sun start + if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + dimList.forEach(d->{ + if("热心居民".equals(d.getType())){ + d.setType("网格员"); + } + }); + } + //2021.5.25 平音客户热心居民改网格员 sun end return dimList; } @@ -488,6 +506,15 @@ public class UserAnalysisServiceImpl implements UserAnalysisService { party.setValue(userIncrTrendResDTO.getPartymemberIncr()); resultList.add(party); } + //2021.5.25 平音客户热心居民改网格员 sun start + if (StrConstant.PY_CUSTOMER.equals(tokenDto.getCustomerId())) { + resultList.forEach(d->{ + if("热心居民".equals(d.getType())){ + d.setType("网格员"); + } + }); + } + //2021.5.25 平音客户热心居民改网格员 sun end return resultList; }