|
|
@@ -33,6 +33,8 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
private CallLogMapper callLogMapper;
|
|
|
@Resource
|
|
|
private SalesTeamMapper salesTeamMapper;
|
|
|
+ @Resource
|
|
|
+ private AdminCallDayMapper adminCallDayMapper;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -62,7 +64,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
BigDecimal rangeReceivables=adminMapper.addAdminContactsRangeReceivables(aid,startTime,endTime);
|
|
|
adminStatisticsBo.setRangeReceivables(rangeReceivables);
|
|
|
//添加外呼数据
|
|
|
- AdminStatisticsBo as=callLogMapper.selectAdminCallSum(aid,startTime,endTime);
|
|
|
+ AdminStatisticsBo as = adminCallDayMapper.selectByAidCount(aid, startTime, endTime);
|
|
|
if (as !=null){
|
|
|
if (as.getCallSum()!=null)adminStatisticsBo.setCallSum(as.getCallSum());
|
|
|
if (as.getCallDurationSum()!=null)adminStatisticsBo.setCallDurationSum(as.getCallDurationSum());
|
|
|
@@ -104,7 +106,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
int teamValidSum=0;
|
|
|
BigDecimal teamCallDurationSum=BigDecimal.ZERO;
|
|
|
for (String s : set) {
|
|
|
- AdminStatisticsBo as=callLogMapper.selectAdminCallSum(s,startTime,endTime);
|
|
|
+ AdminStatisticsBo as = adminCallDayMapper.selectByAidCount(aid, startTime, endTime);
|
|
|
if (as != null) {
|
|
|
if (as.getCallSum()!= null) teamCallSum = teamCallSum + as.getCallSum();
|
|
|
if (as.getCallDurationSum()!= null) teamCallDurationSum = teamCallDurationSum.add(as.getCallDurationSum());
|
|
|
@@ -362,7 +364,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
int teamValidSum=0;
|
|
|
BigDecimal teamCallDurationSum=BigDecimal.ZERO;
|
|
|
//先计算负责人
|
|
|
- AdminStatisticsBo ab=callLogMapper.selectAdminCallSum(aid,startTime,endTime);
|
|
|
+ AdminStatisticsBo ab=adminCallDayMapper.selectByAidCount(aid,startTime,endTime);
|
|
|
if (ab!= null) {
|
|
|
if (ab.getCallSum()!= null) teamCallSum = teamCallSum + ab.getCallSum();
|
|
|
if (ab.getCallDurationSum()!= null) teamCallDurationSum = teamCallDurationSum.add(ab.getCallDurationSum());
|
|
|
@@ -376,7 +378,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
//再计算所有成员
|
|
|
List<Admin> admins = adminMapper.queryByTeamId(e.getId());
|
|
|
for (Admin e2 : admins) {
|
|
|
- AdminStatisticsBo as=callLogMapper.selectAdminCallSum(e2.getId(),startTime,endTime);
|
|
|
+ AdminStatisticsBo as=adminCallDayMapper.selectByAidCount(aid,startTime,endTime);
|
|
|
if (as != null) {
|
|
|
if (as.getCallSum()!= null) teamCallSum = teamCallSum + as.getCallSum();
|
|
|
if (as.getCallDurationSum()!= null) teamCallDurationSum = teamCallDurationSum.add(as.getCallDurationSum());
|