|
|
@@ -7,6 +7,7 @@ import com.goafanti.admin.bo.OutFinanceCount;
|
|
|
import com.goafanti.admin.service.AdminStatisticsService;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.dao.AdminMapper;
|
|
|
+import com.goafanti.common.dao.CallLogMapper;
|
|
|
import com.goafanti.common.dao.FinanceCountMapper;
|
|
|
import com.goafanti.common.dao.PublicReleaseMapper;
|
|
|
import com.goafanti.common.model.AdminUserCount;
|
|
|
@@ -15,6 +16,7 @@ import com.goafanti.core.shiro.token.TokenManager;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
+import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.util.*;
|
|
|
|
|
|
@@ -29,6 +31,8 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
private PublicReleaseMapper publicReleaseMapper;
|
|
|
@Autowired
|
|
|
private FinanceCountMapper financeCountMapper;
|
|
|
+ @Resource
|
|
|
+ private CallLogMapper callLogMapper;
|
|
|
|
|
|
|
|
|
@Override
|
|
|
@@ -57,6 +61,10 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
adminStatisticsBo.setRangePublicReleaseSum(rangePublicReleaseSum);
|
|
|
BigDecimal rangeReceivables=adminMapper.addAdminContactsRangeReceivables(aid,startTime,endTime);
|
|
|
adminStatisticsBo.setRangeReceivables(rangeReceivables);
|
|
|
+ //添加外呼数据
|
|
|
+ AdminStatisticsBo as=callLogMapper.selectAdminCallSum(aid,startTime,endTime);
|
|
|
+ if (as.getCallSum()!=null)adminStatisticsBo.setCallSum(as.getCallSum());
|
|
|
+ if (as.getCallDurationSum()!=null)adminStatisticsBo.setCallDurationSum(as.getCallDurationSum());
|
|
|
return adminStatisticsBo;
|
|
|
}
|
|
|
|