Преглед изворни кода

首页统计团队数据修改

anderx пре 1 година
родитељ
комит
1863021c63

+ 2 - 2
src/main/java/com/goafanti/admin/controller/AdminSalesTeamController.java

@@ -106,8 +106,8 @@ public class AdminSalesTeamController extends CertifyApiController {
      * @return
      */
     @GetMapping("/list")
-    public Result<Pagination<SalesTeamBo>> list(SalesTeam in) {
-        return new Result<>().data(this.salesTeamService.list(in));
+    public Result<Pagination<SalesTeamBo>> list(Integer lvl) {
+        return new Result<>().data(this.salesTeamService.list(lvl));
     }
 
 }

+ 14 - 1
src/main/java/com/goafanti/admin/controller/AdminStatisticsController.java

@@ -102,7 +102,20 @@ public class AdminStatisticsController extends CertifyApiController {
     @RequestMapping(value = "/salesTeam", method = RequestMethod.GET)
     public Result salesTeam(String startTime,String endTime) {
         Result res =new Result();
-        res.data(adminStatisticsService.salesTeam(startTime, endTime));
+        String aid = TokenManager.getAdminId();
+        res.data(adminStatisticsService.salesTeam(aid,startTime, endTime));
+        return res;
+    }
+
+    /**
+     * 营销团队外呼统计缓存清理
+     * @return
+     */
+    @RequestMapping(value = "/salesTeam/clean", method = RequestMethod.GET)
+    public Result salesTeamClean() {
+        Result res =new Result();
+        String aid = TokenManager.getAdminId();
+        res.data(adminStatisticsService.salesTeamClean());
         return res;
     }
 

+ 3 - 1
src/main/java/com/goafanti/admin/service/AdminStatisticsService.java

@@ -13,5 +13,7 @@ public interface AdminStatisticsService {
 
     Object financeLists(String adminId);
 
-    Object salesTeam(String startTime,String endTime);
+    Object salesTeam(String aid,String startTime,String endTime);
+
+    Object salesTeamClean();
 }

+ 1 - 2
src/main/java/com/goafanti/admin/service/SalesTeamService.java

@@ -47,10 +47,9 @@ public interface SalesTeamService {
     /**
      * 列表数据
      *
-     * @param in 参数
      * @return 是否成功
      */
-    Object list(SalesTeam in);
+    Object list(Integer lvl);
 
     boolean checkName(SalesTeam name);
 

+ 13 - 4
src/main/java/com/goafanti/admin/service/impl/AdminStatisticsServiceImpl.java

@@ -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());

+ 2 - 2
src/main/java/com/goafanti/admin/service/impl/SalesTeamServiceImpl.java

@@ -87,7 +87,7 @@ public class SalesTeamServiceImpl extends BaseMybatisDao<SalesTeamMapper> implem
     }
 
     @Override
-    public Object list(SalesTeam in) {
-        return salesTeamMapper.findSalesTeamLvlList(in.getLvl());
+    public Object list(Integer lvl) {
+        return salesTeamMapper.findSalesTeamLvlList(lvl);
     }
 }

+ 1 - 1
src/main/java/com/goafanti/common/dao/SalesTeamMapper.java

@@ -84,7 +84,7 @@ public interface SalesTeamMapper {
 
     SalesTeamBo queryDetailsById(Integer id);
 
-    List<SalesTeamBo> findSalesTeamLvlList(Integer lvl);
+    List<SalesTeamBo> findSalesTeamLvlList(@Param("lvl") Integer lvl);
 
     List<SalesTeam> queryByAid(String aid);
 

+ 2 - 2
src/main/java/com/goafanti/common/mapper/SalesTeamMapper.xml

@@ -153,13 +153,13 @@
     where a.id = #{id}
     </select>
 
-    <select id="findSalesTeamLvlList" resultType="com.goafanti.admin.bo.SalesTeamBo">
+    <select id="findSalesTeamLvlList" resultType="com.goafanti.admin.bo.SalesTeamBo" parameterType="java.lang.Integer">
         select a.id, a.name, a.aid, a.lvl, a.dep_id depId, a.super_id superId, a.status, a.create_time createTime,
         b.name adminName,c.name depName,d.name superName
         from sales_team a left join admin b on a.aid=b.id left join department c on a.dep_id=c.id
         left join sales_team d on a.super_id=d.id
         <where>
-            <if test="lvl!= null">
+            <if test="lvl != null">
                 and a.lvl = #{lvl}
             </if>
         </where>

+ 1 - 0
src/main/java/com/goafanti/core/cache/serializer/FastJsonRedisSerializer.java

@@ -33,6 +33,7 @@ public class FastJsonRedisSerializer implements RedisSerializer<Object> {
 		pc.addAccept("com.goafanti.common.bo.OutPovertyFlag");
 		pc.addAccept("com.goafanti.expenseAccount.bo.ExpenseCountsBo");
 		pc.addAccept("com.goafanti.weChat.bo.releaseAndExpenseCountOut");
+		pc.addAccept("com.goafanti.admin.bo.SalesTeamBo");
 
 	}