|
|
|
@ -87,8 +87,7 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
reportFlowList.add(reportFlowVO);
|
|
|
|
|
}
|
|
|
|
|
map.put("data", reportFlowList);
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
} else {
|
|
|
|
|
List<DistributeReportUserEntity> distributeReportUserList = distributeReportUserMapper.selectList(null);
|
|
|
|
|
for (DistributeReportUserEntity distributeReportUserEntity : distributeReportUserList) {
|
|
|
|
|
ReportFlowVO reportFlowVO = new ReportFlowVO();
|
|
|
|
@ -125,8 +124,7 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
yesterdayDistributeNum += distributeReportUserEntity.getDistributeNum();
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
} else {
|
|
|
|
|
if (userId == null) {
|
|
|
|
|
throw new BadRequestException("参数异常");
|
|
|
|
|
}
|
|
|
|
@ -155,6 +153,11 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
if (CollUtil.isEmpty(allRecordInTodayList)) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
//今日总量
|
|
|
|
|
int sum = allRecordInTodayList.stream().mapToInt(ClueRecordEntity::getSuccessNum).sum();
|
|
|
|
|
if (sum < 1) {
|
|
|
|
|
return;
|
|
|
|
|
}
|
|
|
|
|
// 提取所有用户
|
|
|
|
|
Set<Long> collect = allRecordInTodayList.stream()
|
|
|
|
|
.map(ClueRecordEntity::getCreateBy)
|
|
|
|
@ -171,8 +174,9 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
// 之前的总量
|
|
|
|
|
Long historyTotal = distributeReportUserMapper.selectCount(
|
|
|
|
|
new LambdaQueryWrapper<DistributeReportUserEntity>().select(DistributeReportUserEntity::getTotalNum));
|
|
|
|
|
int sum = allRecordInTodayList.stream().mapToInt(ClueRecordEntity::getSuccessNum).sum();
|
|
|
|
|
|
|
|
|
|
int totalAll = historyTotal.intValue() + sum;
|
|
|
|
|
|
|
|
|
|
// 记录之前得统计id
|
|
|
|
|
List<Long> ids = new ArrayList<>();
|
|
|
|
|
for (Map.Entry<Long, List<ClueRecordEntity>> entry : recordByUserMap.entrySet()) {
|
|
|
|
@ -195,8 +199,7 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
}
|
|
|
|
|
yesterdayTotalNum = distributeReportUserByYesterday.getTotalNum();
|
|
|
|
|
ids.add(distributeReportUserByYesterday.getId());
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
} else {
|
|
|
|
|
distributeReportUserByYesterday = new DistributeReportUserEntity();
|
|
|
|
|
}
|
|
|
|
|
// 总数
|
|
|
|
@ -256,8 +259,7 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
}
|
|
|
|
|
yesterdayTotalNum = distributeReportUserByYesterday.getTotalNum();
|
|
|
|
|
ids.add(distributeReportUserByYesterday.getId());
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
} else {
|
|
|
|
|
distributeReportUserByYesterday = new DistributeReportChannelEntity();
|
|
|
|
|
}
|
|
|
|
|
int totalNum = yesterdayTotalNum + sumByUser;
|
|
|
|
@ -302,8 +304,7 @@ public class DistributeReportServiceImpl extends ExtendServiceImpl<DistributeRep
|
|
|
|
|
reportFlowVO.setRatioDay(reportDeduct.getRatioDay());
|
|
|
|
|
reportFlowVO.setRatio(reportDeduct.getRatio());
|
|
|
|
|
reportFlowVO.setTotalNum(reportDeduct.getTodayNum());
|
|
|
|
|
}
|
|
|
|
|
else {
|
|
|
|
|
} else {
|
|
|
|
|
reportFlowVO.setRatioDay(0.0);
|
|
|
|
|
reportFlowVO.setRatio(0.0);
|
|
|
|
|
reportFlowVO.setTotalNum(0);
|
|
|
|
|