From 722987fa2b2f5cd744d9ed236c850453a80e2b85 Mon Sep 17 00:00:00 2001 From: jianjun Date: Mon, 29 Jun 2020 15:48:24 +0800 Subject: [PATCH] =?UTF-8?q?self=E7=9A=84pid=20=E6=98=AF=E5=AE=83=E6=9C=AC?= =?UTF-8?q?=E8=BA=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/service/impl/StatsPublicityServiceImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java index eabcec07ad..63751accec 100644 --- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java +++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java @@ -465,7 +465,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { //构建机关自己的数据 FactArticlePublishedAgencyDailyEntity selfDaily = ConvertUtils.sourceToTarget(dimIdBean, FactArticlePublishedAgencyDailyEntity.class); selfDaily.setCustomerId(gridDailyEntities.getCustomerId()); - selfDaily.setPid(gridDailyEntities.getPid()); + selfDaily.setPid(summaryDTO.getAgencyId()); selfDaily.setAgencyId(summaryDTO.getAgencyId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX)); selfDaily.setArticleTotalCount(summaryDTO.getArticleTotalCount()); selfDaily.setArticlePublishedCount(summaryDTO.getArticlePublishedCount()); @@ -571,7 +571,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { convertTagUsedDepartmentDailyEntity(tagUsedDeptDailyMap, articleEntity, tagEntity, dimIdBean); break; case ProjectConstant.PUBLISHER_TYPE_AGENCY: - convertTagUsedAgencyDailySelfEntity(dimAgencyEntity.getPid(), tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean); + convertTagUsedAgencyDailySelfEntity( tagUsedAgencyDailySelfMap, articleEntity, tagEntity, dimIdBean); break; } } @@ -1048,14 +1048,14 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { } } - private void convertTagUsedAgencyDailySelfEntity(String pid, Map result, ArticleEntity articleEntity, ArticleTagsEntity tagEntity, DimIdGenerator.DimIdBean dimIdBean) { + private void convertTagUsedAgencyDailySelfEntity(Map result, ArticleEntity articleEntity, ArticleTagsEntity tagEntity, DimIdGenerator.DimIdBean dimIdBean) { String agencyId = articleEntity.getOrgId().concat(DimAgencyConstant.TYPE_SELF_ID_SUFFIX); String tagId = tagEntity.getTagId(); String key = agencyId.concat(StrConstant.UNDER_LINE).concat(tagId); FactTagUsedAgencyDailyEntity entity = result.get(key); if (entity == null) { entity = ConvertUtils.sourceToTarget(dimIdBean, FactTagUsedAgencyDailyEntity.class); - entity.setPid(pid); + entity.setPid(articleEntity.getOrgId()); entity.setCustomerId(articleEntity.getCustomerId()); entity.setAgencyId(agencyId); entity.setTagId(tagId); @@ -1118,7 +1118,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService { FactTagViewedAgencyDailyEntity entity = result.get(key); if (entity == null) { entity = ConvertUtils.sourceToTarget(dimIdBean, FactTagViewedAgencyDailyEntity.class); - entity.setPid(dimAgencyEntity.getPid()); + entity.setPid(dimAgencyEntity.getId()); entity.setCustomerId(tagEntity.getCustomerId()); entity.setAgencyId(agencyId); entity.setTagId(tagId);