|
|
@@ -8,7 +8,10 @@ import com.goafanti.common.model.Admin;
|
|
|
import com.goafanti.common.model.AdminUserCount;
|
|
|
import com.goafanti.common.model.SalesTeam;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
+import com.goafanti.common.utils.LoggerUtils;
|
|
|
import com.goafanti.core.shiro.token.TokenManager;
|
|
|
+import org.springframework.cache.annotation.CacheEvict;
|
|
|
+import org.springframework.cache.annotation.Cacheable;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
@@ -331,10 +334,9 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Object salesTeam(String startTime, String endTime) {
|
|
|
+ @Cacheable(value = "salesTeam#600", key = "'key:'+#aid+'_'+#startTime+'-'+#endTime")
|
|
|
+ public Object salesTeam(String aid,String startTime, String endTime) {
|
|
|
List<SalesTeamBo> resList=new ArrayList<>();
|
|
|
- String aid = TokenManager.getAdminId();
|
|
|
-
|
|
|
List<SalesTeam> salesTeams = salesTeamMapper.queryByAid(aid);
|
|
|
//如果不是团队负责人,所有数据都为null
|
|
|
int teamCallSum=0;
|
|
|
@@ -368,6 +370,13 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
return resList;
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ @CacheEvict(value = "salesTeam#600", allEntries = true)
|
|
|
+ public Object salesTeamClean() {
|
|
|
+ LoggerUtils.debug(getClass(),"营销团队缓存清理");
|
|
|
+ return 1;
|
|
|
+ }
|
|
|
+
|
|
|
private void addSonTeam(List<SalesTeamBo>list, SalesTeamBo salesTeamBo, String startTime, String endTime) {
|
|
|
List<SalesTeam> salesTeams = salesTeamMapper.queryBySuperId(salesTeamBo.getId());
|
|
|
|
|
|
@@ -378,7 +387,7 @@ public class AdminStatisticsServiceImpl implements AdminStatisticsService {
|
|
|
int teamCallSum=0;
|
|
|
BigDecimal teamCallDurationSum=BigDecimal.ZERO;
|
|
|
//先计算负责人
|
|
|
- AdminStatisticsBo ab=callLogMapper.selectAdminCallSum(s,startTime,endTime);
|
|
|
+ AdminStatisticsBo ab=callLogMapper.selectAdminCallSum(e.getAid(),startTime,endTime);
|
|
|
if (ab!= null) {
|
|
|
if (ab.getCallSum()!= null) teamCallSum = teamCallSum + ab.getCallSum();
|
|
|
if (ab.getCallDurationSum()!= null) teamCallDurationSum = teamCallDurationSum.add(ab.getCallDurationSum());
|