|
|
@ -134,7 +134,7 @@ 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("根据customerId查询其所有下级子客户idresult: "+JSON.toJSONString(result)); |
|
|
|
// log.info("根据customerId查询其所有下级子客户id result: "+JSON.toJSONString(result));
|
|
|
|
if (result.success() && CollectionUtils.isNotEmpty(result.getData())) { |
|
|
|
customerIds.addAll(result.getData()); |
|
|
|
} |
|
|
@ -146,7 +146,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW |
|
|
|
} |
|
|
|
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(), |
|
|
@ -167,7 +167,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW |
|
|
|
|
|
|
|
returnDto.getSubRankList().addAll(subAgencyRankList); |
|
|
|
returnDto.getSubRankList().addAll(subGridList); |
|
|
|
log.info("returnDto.getSubRankList()="+returnDto.getSubRankList()); |
|
|
|
// log.info("returnDto.getSubRankList()="+returnDto.getSubRankList());
|
|
|
|
int participateUserTotal = 0; |
|
|
|
int participateTotal = 0; |
|
|
|
for (WorkRecordSubRank subAgency : returnDto.getSubRankList()) { |
|
|
|