From e6104b5f6d01857e1bbe11597a602d048682bc21 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Mon, 4 Jan 2021 10:33:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=97=E5=8F=82=E4=B8=8E=20?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PublicPartExtractServiceImpl.java         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
index dc5ba0ba2e..aa8c4728dc 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/toscreen/impl/PublicPartExtractServiceImpl.java
@@ -94,7 +94,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     private void extractGridUserJoin(ExtractScreenFormDTO formDTO) {
         List<DimGridEntity> orgList = dimGridService.getGridListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
-            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,客户Id:{}", formDTO.getCustomerId());
+            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,customerId:{}", formDTO.getCustomerId());
             return;
         }
         //构建组织数据
@@ -103,12 +103,12 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         //获取议题月份增量
         List<FactIssueGridMonthlyEntity> issueTotal = factIssueGridMonthlyService.getIssueIncCountAndTotalByMonthId(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取议题增量为空,客户Id:{}", formDTO.getCustomerId());
+            log.error("抽取【公众参与-人均议题】，获取议题增量为空,customerId:{}", formDTO.getCustomerId());
             return;
         }
         List<GridUserCountResultDTO> userCountList = factRegUserGridMonthlyService.selectGridUserCount(formDTO.getCustomerId(), formDTO.getMonthId());
         if (CollectionUtils.isEmpty(userCountList)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,客户Id:{}", formDTO.getCustomerId());
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,customerId:{}", formDTO.getCustomerId());
             return;
         }
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
@@ -143,7 +143,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
             //获取每个网格的应表决人数
             List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
             if (CollectionUtils.isEmpty(memberCountList)) {
-                log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,客户Id:{}", formDTO.getCustomerId());
+                log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,customerId:{}", formDTO.getCustomerId());
                 return;
             }
             gridMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));
@@ -184,7 +184,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
     private void extractAgencyUserJoin(ExtractScreenFormDTO formDTO) {
         List<DimAgencyEntity> orgList = dimAgencyService.getAgencyListByCustomerId(formDTO.getCustomerId());
         if (CollectionUtils.isEmpty(orgList)) {
-            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,客户Id:{}", formDTO.getCustomerId());
+            log.warn("抽取【公众参与-人均议题】，获取组织数据失败,customerId:{}", formDTO.getCustomerId());
             return;
         }
         //构建组织数据
@@ -196,7 +196,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
         Map<String, GridUserCountResultDTO> userCountMap = userCountList.stream().collect(Collectors.toMap(GridUserCountResultDTO::getOrgId, o -> o));
         Set<String> agencyIdSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(issueTotal)) {
-            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,客户Id:{}", formDTO.getCustomerId());
+            log.error("抽取【公众参与-人均议题】，获取注册用户数为空,customerId:{}", formDTO.getCustomerId());
             issueTotal.forEach(issue -> {
                 String agencyId = issue.getAgencyId();
                 agencyIdSet.add(agencyId);
@@ -219,7 +219,7 @@ public class PublicPartExtractServiceImpl implements PublicPartExtractService {
                     //获取每个网格的应表决人数
                     List<GridGroupUserCountResultDTO> memberCountList = factOriginGroupMainDailyService.selectDistinctGroupMemberCount(formDTO.getCustomerId(), ProjectConstant.AGENCY_ID);
                     if (CollectionUtils.isEmpty(memberCountList)) {
-                        log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,客户Id:{}", formDTO.getCustomerId());
+                        log.warn("抽取【公众参与-人均议题】，获取应表决人数为空,customerId:{}", formDTO.getCustomerId());
                         return;
                     }
                     orgMemberCount = memberCountList.stream().collect(Collectors.toMap(GridGroupUserCountResultDTO::getOrgId, o -> o.getMemberCount()));