From e9a07fdad60f789590bfad1c09fc9684cfeb39dc Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 8 Mar 2021 10:39:06 +0800
Subject: [PATCH] =?UTF-8?q?rankList=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=9AdateId=20is=20null=20=E8=B5=8B=E5=80=BC=E4=B8=BA?=
 =?UTF-8?q?=E6=98=A8=E5=A4=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ScreenWorkRecordOrgDailyServiceImpl.java      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
index 2144440ad0..8cabbe6145 100644
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
+++ b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
@@ -134,20 +134,19 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
     public WorkRecordRankResultDTO rankList(WorkRecordRankFormDTO formDTO) {
         List<String> customerIds=new ArrayList<>();
         Result<List<String>> result=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId());
-        // log.info("result:  "+JSON.toJSONString(result));
+        log.info("根据customerId查询其所有下级子客户idresult:  "+JSON.toJSONString(result));
         if (result.success() && CollectionUtils.isNotEmpty(result.getData())) {
             customerIds.addAll(result.getData());
         }
         customerIds.add(formDTO.getCustomerId());
         String dateId= baseDao.selectLatestDateId(customerIds);
         if(StringUtils.isBlank(dateId)){
-            log.warn("selectLatestDateId dateId is null customerIds" + JSON.toJSONString(customerIds));
+            dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
+            log.warn("dateId 赋值为"+dateId+" ; selectLatestDateId dateId is null customerIds" + JSON.toJSONString(customerIds));
         }
-        log.info("=============dateId:"+dateId);
-        dateId= com.epmet.commons.tools.utils.DateUtils.getBeforeNDay(NumConstant.ONE);
         WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO();
         AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId());
-        // log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
+        log.info("agencyInfoDTO:  "+JSON.toJSONString(agencyInfoDTO));
         //当前组织的自身的数据
         List<WorkRecordSubRank> currentAgency = baseDao.selectCurrentAgency(formDTO.getAgencyId(),
                 formDTO.getDataType(),
@@ -168,6 +167,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
 
         returnDto.getSubRankList().addAll(subAgencyRankList);
         returnDto.getSubRankList().addAll(subGridList);
+        log.info("returnDto.getSubRankList()="+returnDto.getSubRankList());
         int participateUserTotal = 0;
         int participateTotal = 0;
         for (WorkRecordSubRank subAgency : returnDto.getSubRankList()) {