From 4208adc39369e4dafd6bba59e9f9cc079da7cb46 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Wed, 28 Oct 2020 14:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E6=96=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/impl/DistributionServiceImpl.java              | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java
index d97d1c9643..c94e85dc89 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/DistributionServiceImpl.java
@@ -61,10 +61,10 @@ public class DistributionServiceImpl implements DistributionService {
      * @author zxc
      * @date 2020/10/27 11:11 上午
      */
+    @DataSource(value = DataSourceConstant.EVALUATION_INDEX,datasourceNameFromArg = true)
     @Override
     public BranchCountResultDTO branchCount(BranchCountFormDTO branchCountFormDTO) {
         BranchCountResultDTO branchCountResultDTO = screenCustomerGridDao.selectAgencyInfo(branchCountFormDTO.getAgencyId());
-        log.info("本级机关信息"+branchCountResultDTO.toString());
         if (null == branchCountResultDTO){
             return new BranchCountResultDTO();
         }
@@ -72,9 +72,7 @@ public class DistributionServiceImpl implements DistributionService {
             return new BranchCountResultDTO();
         }
         List<SubBranchCountResultDTO> agencyIds = screenCustomerAgencyDao.selectSubAgencyId(branchCountFormDTO.getAgencyId());
-        log.info("下级机关信息："+agencyIds.toString());
         List<SubBranchCountResultDTO> subList = screenCustomerGridDao.selectBranchCount(branchCountFormDTO.getAgencyId());
-        log.info("党支部数"+subList.toString());
         if (!CollectionUtils.isEmpty(subList)){
             subList.forEach(sub -> {
                 agencyIds.forEach(agencyId -> {
@@ -84,9 +82,7 @@ public class DistributionServiceImpl implements DistributionService {
                 });
             });
         }
-        log.info("给党支部赋值subAgencyId"+subList.toString());
         Map<String, List<SubBranchCountResultDTO>> groupBySubAgency = subList.stream().collect(Collectors.groupingBy(sub -> sub.getSubAgencyId()));
-        log.info("subList分组"+groupBySubAgency.toString());
         agencyIds.forEach(a -> {
             groupBySubAgency.forEach((agencyId,value) -> {
                 if (a.getSubId().equals(agencyId)){
@@ -94,9 +90,7 @@ public class DistributionServiceImpl implements DistributionService {
                 }
             });
         });
-        log.info("赋值之后的"+agencyIds.toString());
         branchCountResultDTO.setPartyDistribution(CollectionUtils.isEmpty(agencyIds) ? new ArrayList<>() : agencyIds);
-        log.info("最后结果："+branchCountResultDTO);
         return branchCountResultDTO;
     }