From dd0cb13cb1b4d847358bb5f8e5ad4dc9d4940a05 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Mon, 22 Nov 2021 15:40:54 +0800
Subject: [PATCH] =?UTF-8?q?projectClosedCountt=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/service/impl/ScreenGovernanceServiceImpl.java    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
index 7209bac5..3ffcf960 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/service/impl/ScreenGovernanceServiceImpl.java
@@ -11,8 +11,6 @@ import com.elink.esua.epdc.dto.screen.result.*;
 import com.elink.esua.epdc.modules.screen.dao.ScreenGovernanceDao;
 import com.elink.esua.epdc.modules.screen.service.ScreenGovernanceService;
 import com.elink.esua.epdc.utils.EpmetUtils;
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -29,7 +27,6 @@ import java.util.Optional;
  * @author zhy
  * @date 2021/6/28 13:51
  */
-@Slf4j
 @Service
 public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanceDao, ScreenGovernanceResultDTO> implements ScreenGovernanceService {
 
@@ -73,6 +70,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
                 agencyResult.setTransferCount(agencyResult.getTransferCount() + item.getTransferCount());
                 agencyResult.setResolvedCount(agencyResult.getResolvedCount() + item.getResolvedCount());
                 agencyResult.setClosedCount(agencyResult.getClosedCount() + item.getResolvedCount());
+                agencyResult.setClosedProjectCount(agencyResult.getClosedCount() + item.getResolvedCount());
                 agencyResult.setGovernCount(agencyResult.getGovernCount() + item.getGovernCount());
                 agencyResult.setSatisfactionCount(agencyResult.getSatisfactionCount() + item.getSatisfactionCount());
             }
@@ -95,6 +93,7 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
                 agencyResult.setTransferCount(transferCount);
                 agencyResult.setResolvedCount(resolvedCount);
                 agencyResult.setClosedCount(closedCount);
+                agencyResult.setClosedProjectCount(closedCount);
                 agencyResult.setGovernCount(governCount);
                 agencyResult.setSatisfactionCount(satisfactionCount);
             }
@@ -132,7 +131,6 @@ public class ScreenGovernanceServiceImpl extends BaseServiceImpl<ScreenGovernanc
         jsonObject.put("dateId", yearMonthDay);
         jsonObject.put("dataList", data);
         String body = epmetUtils.httpPost(EpmetConstant.EPMET_SCREEN_GOV_RANK_DATA, JSONObject.toJSONString(jsonObject));
-        log.info(body);
         return new Result();
     }