elink-star
/
ShibeiWorkPlatform
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

rankList接口修改：dateId is null 赋值为昨天

dev_shibei_match
yinzuomei 5 years ago
parent
e9a07fdad6
commit
f9cf70954f
1 changed files with 3 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java

6
epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/plugins/impl/ScreenWorkRecordOrgDailyServiceImpl.java
View File

@ -134,7 +134,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
public WorkRecordRankResultDTO rankList(WorkRecordRankFormDTO formDTO) { public WorkRecordRankResultDTO rankList(WorkRecordRankFormDTO formDTO) {
List<String> customerIds=new ArrayList<>(); List<String> customerIds=new ArrayList<>();
Result<List<String>> result=operCrmOpenFeignClient.getAllSubCustomerIds(formDTO.getCustomerId()); 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())) { if (result.success() && CollectionUtils.isNotEmpty(result.getData())) {
customerIds.addAll(result.getData()); customerIds.addAll(result.getData());
} }
@ -146,7 +146,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
} }
WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO(); WorkRecordRankResultDTO returnDto = new WorkRecordRankResultDTO();
AgencyInfoDTO agencyInfoDTO = agencyService.getAgencyInfoDTO(formDTO.getAreaCode(), formDTO.getAgencyId()); 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(), List<WorkRecordSubRank> currentAgency = baseDao.selectCurrentAgency(formDTO.getAgencyId(),
formDTO.getDataType(), formDTO.getDataType(),
@ -167,7 +167,7 @@ public class ScreenWorkRecordOrgDailyServiceImpl extends BaseServiceImpl<ScreenW
returnDto.getSubRankList().addAll(subAgencyRankList); returnDto.getSubRankList().addAll(subAgencyRankList);
returnDto.getSubRankList().addAll(subGridList); returnDto.getSubRankList().addAll(subGridList);
log.info("returnDto.getSubRankList()="+returnDto.getSubRankList()); // log.info("returnDto.getSubRankList()="+returnDto.getSubRankList());
int participateUserTotal = 0; int participateUserTotal = 0;
int participateTotal = 0; int participateTotal = 0;
for (WorkRecordSubRank subAgency : returnDto.getSubRankList()) { for (WorkRecordSubRank subAgency : returnDto.getSubRankList()) {

Write Preview
Loading…
Cancel
Save