Browse Source

版本更换

anderx 4 years ago
parent
commit
a89ea9479b

+ 2 - 2
src/main/java/com/goafanti/order/bo/OutHighNewRetrialList.java

@@ -8,13 +8,13 @@ public class OutHighNewRetrialList {
     private Integer province;
     @Excel(name = "省份")
     private String provinceName;
+    @Excel(name = "跟进人")
+    private String name;
     @Excel(name = "高新总数")
     private Integer quantity;
     @Excel(name = "已通过高新数")
     private Integer pass;
     private String aid;
-    @Excel(name = "跟进人")
-    private String name;
     @Excel(name = "已回签")
     private Integer signBacks;
     @Excel(name = "未通过高新数")

+ 9 - 2
src/main/java/com/goafanti/user/bo/outProvinceFollowStatistic.java

@@ -1,13 +1,20 @@
 package com.goafanti.user.bo;
 
+import com.goafanti.common.utils.excel.Excel;
+
 public class outProvinceFollowStatistic {
     private String id;
+    @Excel(name = "面谈部门")
     private String name;
     private String uid;
-    private String nickname;
+    @Excel(name = "客户类型" ,readConverterExp = "0=新客户,1=老客户")
     private Integer newUser;
-    private Integer sign;
+    @Excel(name = "面谈客户")
+    private String nickname;
+    @Excel(name = "面谈数")
     private Integer quantity;
+    @Excel(name = "签单数")
+    private Integer sign;
 
     public Integer getSign() {
         return sign;

+ 25 - 0
src/main/java/com/goafanti/user/controller/UserFollowController.java

@@ -5,6 +5,7 @@ import com.goafanti.common.controller.BaseApiController;
 import com.goafanti.common.utils.excel.NewExcelUtil;
 import com.goafanti.user.bo.InputUserFollowList;
 import com.goafanti.user.bo.outFollowStatisticsList;
+import com.goafanti.user.bo.outProvinceFollowStatistic;
 import com.goafanti.user.bo.outUserFollowList;
 import com.goafanti.user.service.UserFollowService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -94,5 +95,29 @@ public class UserFollowController extends BaseApiController {
         return res.data(userFollowService.provinceFollowStatisticsList(depId,date,province,sort));
     }
 
+    /**
+     * 省份面谈跟进统计
+     * @return
+     */
+    @RequestMapping(value = "/provinceFollowStatisticsListExport", method = RequestMethod.GET)
+    public Result  provinceFollowStatisticsListExport(String depId,String depName,String date,Integer province,String provinceName,Integer sort){
+        List<outProvinceFollowStatistic> list = userFollowService.provinceFollowStatisticsList(depId, date, province, sort);
+        NewExcelUtil<outProvinceFollowStatistic>excelUtil =new NewExcelUtil<>(outProvinceFollowStatistic.class);
+        StringBuffer sb=new StringBuffer("搜索条件=》");
+        if (depName!=null)sb=sb.append("部门:").append(depName).append(",");
+        if(provinceName!=null)sb=sb.append("省份:").append(provinceName).append(",");
+        if(sort!=null){
+            sb=sb.append("排序:");
+            if (sort==0)sb=sb.append("按签单");
+            else if (sort==1)sb=sb.append("按面谈");
+            sb=sb.append(",");
+        }
+        if (date!=null){
+            sb=sb.append("时间:").append(date).append(",");
+        }
+        return excelUtil.exportExcel(list,"省份面谈跟进统计",uploadPath,sb.substring(0,sb.toString().length()-1));
+
+    }
+
 }
 

+ 1 - 1
src/main/resources/props/config_test.properties

@@ -34,8 +34,8 @@ session.timeout=12000000
 session.validate.timespan=18000000
 
 app.name=AFT
-template.cacheable=false
 
+template.cacheable=false
 user.receive.max=10
 user.private.max=1000
 #客户释放提醒