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 customerIds=new ArrayList<>(); Result> 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 currentAgency = baseDao.selectCurrentAgency(formDTO.getAgencyId(), formDTO.getDataType(), @@ -168,6 +167,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl