调整代码

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/impl/StatsPublicityServiceImpl.java

@@ -389,7 +389,7 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 			summary.setArticleTotalCount(summaryDTO.getArticleTotalCount());
 			summary.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
 			summary.setPublishedCount(summaryDTO.getPublishedCount());
-			result.put(summaryDTO.getPublisherId(), summaryDTO);
+			result.put(summaryDTO.getAgencyId(), summaryDTO);
 		} else {
 			publishedSummaryDTO.setArticlePublishedCount(publishedSummaryDTO.getArticlePublishedCount() + summaryDTO.getArticlePublishedCount());
 			publishedSummaryDTO.setArticleTotalCount(publishedSummaryDTO.getArticleTotalCount() + summaryDTO.getArticlePublishedCount());
@@ -451,6 +451,20 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 		try {
 			//转换为 需要插入的Entity
 			Map<String, FactArticlePublishedAgencyDailyEntity> agencyDailyEntityMap = convertAgencyDailyEntity(agencyDTOList, dimIdBean);
+			if (!CollectionUtils.isEmpty(agencySummaryMap)){
+				//同一个机关下数据累加
+				for (Map.Entry<String, ArticleGridPublishedSummaryDTO> entry : agencySummaryMap.entrySet()) {
+					String agencyId = entry.getKey();
+					ArticleGridPublishedSummaryDTO summary = entry.getValue();
+					FactArticlePublishedAgencyDailyEntity dimAgencyEntity = agencyDailyEntityMap.get(agencyId);
+					if (dimAgencyEntity == null) {
+						continue;
+					}
+					dimAgencyEntity.setArticleTotalCount(dimAgencyEntity.getArticlePublishedCount()+summary.getArticleTotalCount());
+					dimAgencyEntity.setArticlePublishedCount(dimAgencyEntity.getPublishedCount()+summary.getArticlePublishedCount());
+					dimAgencyEntity.setPublishedCount(dimAgencyEntity.getPublishedCount()+summary.getPublishedCount());
+				}
+			}
 			//获取当天的业务数据
 			List<ArticleGridPublishedSummaryDTO> publishedArticleCount = articleService.getAllAgencyPublishedCount(customerId, statsDate);
 			Map<String, FactArticlePublishedAgencyDailyEntity> haveDataAgencyDailyMap = new HashMap<>();
@@ -465,9 +479,11 @@ public class StatsPublicityServiceImpl implements StatsPublicityService {
 					gridDailyEntities.setArticleTotalCount(summaryDTO.getArticleTotalCount());
 					gridDailyEntities.setArticlePublishedCount(summaryDTO.getArticlePublishedCount());
 					gridDailyEntities.setPublishedCount(summaryDTO.getPublishedCount());
+
+
+
 					haveDataAgencyDailyMap.put(summaryDTO.getAgencyId(), gridDailyEntities);
-					//同一个机关下数据累加
+
-					//buildAgencySummaryData(agencySummaryMap, summaryDTO);
 					//构建机关自己的数据
 					FactArticlePublishedAgencyDailyEntity selfDaily = ConvertUtils.sourceToTarget(dimIdBean, FactArticlePublishedAgencyDailyEntity.class);
 					selfDaily.setCustomerId(gridDailyEntities.getCustomerId());