Merge remote-tracking branch 'remotes/origin/dev_data_stats' into dev

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<String, FactTagUsedAgencyDailyEntity> result, ArticleEntity articleEntity, ArticleTagsEntity tagEntity, DimIdGenerator.DimIdBean dimIdBean) {
+	private void convertTagUsedAgencyDailySelfEntity(Map<String, FactTagUsedAgencyDailyEntity> 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);