Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/common/StringUtils.java

@@ -3,8 +3,12 @@ package com.huiju.estateagents.common;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 public class StringUtils {
+    private static Pattern humpPattern = Pattern.compile("[A-Z]");
+
     public static boolean isEmpty(String str) {
         return null == str || "".equals(str.trim()) || "null".equals(str) || "undefined".equals(str);
     }
@@ -44,4 +48,25 @@ public class StringUtils {
             return str;
         }
     }
+
+    public static String humpToLine(String str) {
+        if (null == str || "".equals(str)) return "";
+
+        Matcher matcher = humpPattern.matcher(str);
+        StringBuffer sb = new StringBuffer();
+        while (matcher.find()) {
+            matcher.appendReplacement(sb, "_" + matcher.group(0).toLowerCase());
+        }
+        matcher.appendTail(sb);
+        return sb.toString();
+    }
+
+    public static String strToUnicode(String str) {
+        char[] chars = str.toCharArray();
+        String returnStr = "";
+        for (int i = 0; i < chars.length; i++) {
+            returnStr += "\\u" + Integer.toString(chars[i], 16);
+        }
+        return returnStr;
+    }
 }

src/main/java/com/huiju/estateagents/controller/ExtendContentController.java

@@ -5,20 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.taUser.entity.TaUser;
-import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.MD5Utils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.service.*;
 import com.huiju.estateagents.service.impl.HelpActivityServiceImpl;
-import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.ibatis.annotations.Param;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +20,6 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Collection;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -104,7 +97,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
-            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().isNull("building_id"));
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
             IPage<ExtendContent> result = iExtendContentService.page(pg, queryWrapper);
@@ -192,6 +185,7 @@ public class ExtendContentController extends BaseController {
         if (StringUtils.isEmpty(extendContent.getContentType())){
             extendContent.setContentType("nothing");
         }
+        extendContent.setCreateUser(getUserId(request));
         responseBean = iExtendContentService.extendContentAdd(extendContent);
         responseBean.addSuccess(extendContent);
         return responseBean;

src/main/java/com/huiju/estateagents/controller/StatisticalController.java

@@ -5,10 +5,13 @@ import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.IStatisticalService;
+import com.huiju.estateagents.statistic.entity.TsPersonFromStatistic;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,7 +23,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 数据统计
@@ -64,6 +69,17 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectNewsUserCount(getOrgId(request), startDate, endDate);
     }
 
+    /**
+     * 新增用户数
+     * @return
+     */
+    @GetMapping(value = "/admin/changeNewsUserCount")
+    public ResponseBean changeNewsUserCount(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                            @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                            HttpServletRequest request) {
+        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate);
+    }
+
     /**
      * 转化率 统计
      * @return
@@ -175,6 +191,25 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
     }
 
+    /**
+     * 意向用户 导出
+     * @return
+     */
+    @GetMapping(value = "/admin/exportIntentionUser")
+    public void getBuildingTimeTableList(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=意向客户.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), IntentionUser.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目详情统计").build();
+        List<IntentionUser> list = iStatisticalService.getExportIntentionUser(getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
     /**
      * 用户来源  首页
      * @return
@@ -295,4 +330,73 @@ public class StatisticalController extends BaseController {
         excelWriter.finish();
     }
 
+
+
+    /**
+     * 新增用户导出
+     * @return
+     */
+    @GetMapping(value = "/admin/exportUserStats")
+    public void exportUserStats(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                         @RequestParam(value = "userType", required = false) String userType,
+                                         HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=新增用户.xlsx");
+        ResponseBean responseBean = iStatisticalService.selectPersonFrom(getOrgId(request), startDate, endDate);
+        List<List<String>> headerList = headerList(responseBean.getData());
+        List<List<String>> dataList = dataList(responseBean.getData(),userType);
+        EasyExcel.write(response.getOutputStream()).head(headerList).sheet("新增用户").doWrite(dataList);
+    }
+
+    /**
+     * 构建表数据
+     * @param data
+     * @return
+     */
+    private List<List<String>> dataList(Object data,String userType) {
+        Map<String, Object> map = (Map<String, Object>) data;
+        List<TsPersonFromStatistic> list = (List<TsPersonFromStatistic>) map.get("list");
+        List<List<String>> dataList = new ArrayList<>();
+        List<TdWxDict> tdWxDicts = (List<TdWxDict>) map.get("tdWxDicts");
+        list.forEach(l -> {
+            List<String> columlist = new ArrayList<>();
+            columlist.add(l.getCreateTime());
+            tdWxDicts.forEach(e -> {
+                if (e.getSceneType().equals(l.getSceneType())){
+                    if (userType.equals("registered")){
+                        columlist.add(l.getRegisteredNum().toString());
+                    }else {
+                        columlist.add(l.getFromNum().toString());
+                    }
+                }else {
+                    columlist.add("0");
+                }
+            });
+            dataList.add(columlist);
+        });
+        return dataList;
+    }
+
+    /**
+     * 构造表头
+     * @param data
+     * @return
+     */
+    private List<List<String>> headerList(Object data) {
+        Map<String, Object> map = (Map<String, Object>) data;
+        List<TdWxDict> tdWxDicts = (List<TdWxDict>) map.get("tdWxDicts");
+        List<List<String>> headerList = new ArrayList<>();
+        List<String> rqHeader = new ArrayList<>();
+        rqHeader.add("日期");
+        headerList.add(rqHeader);
+        tdWxDicts.forEach(e -> {
+            List<String> header = new ArrayList<>();
+            header.add(e.getSceneAlias());
+            headerList.add(header);
+        });
+        return headerList;
+    }
+
 }

src/main/java/com/huiju/estateagents/controller/TsConsultantKpiController.java

@@ -0,0 +1,461 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.excel.TaActivityDynamicEnlistExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.huiju.estateagents.service.ITsConsultantKpiService;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * <p>
+    * 置业顾问KPI  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-04-14
+ */
+@RestController
+@RequestMapping("/api/admin/stats")
+public class TsConsultantKpiController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsConsultantKpiController.class);
+
+    @Autowired
+    public ITsConsultantKpiService iTsConsultantKpiService;
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param asc
+     * @param desc
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/consultant/kpi",method= RequestMethod.GET)
+    public ResponseBean stsConsultantKpiList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            // startDate 默认格式 YYYYMMDD
+                                            @RequestParam(value ="startDate", required = false) String startDate,
+                                            @RequestParam(value ="endDate", required = false) String endDate,
+                                            @RequestParam(value ="buildingId", required = false) String buildingId,
+                                            @RequestParam(value ="asc", required = false) String asc,
+                                            @RequestParam(value ="desc", required = false) String desc,
+                                            HttpServletRequest request
+        ){
+        if (null == startDate || "".equals(startDate)) {
+            return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (null == endDate || "".equals(endDate)) {
+            endDate = DateUtils.today();
+        }
+
+        Integer orgId = getOrgId(request);
+        try {
+            // 汇总明细
+            IPage<TsConsultantKpi> result = iTsConsultantKpiService.stsKPIDaily(pageNum, pageSize, orgId, buildingId, startDate, endDate, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+            // 汇总
+            TsConsultantKpi total = iTsConsultantKpiService.stsKPITotalByOrg(orgId, buildingId, startDate, endDate);
+            return ResponseBean.success(new HashMap<String, Object>(){{
+                put("paged", result);
+                put("total", total);
+            }});
+        }catch (Exception e){
+//            e.printStackTrace();
+            return ResponseBean.error("查询出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+    }
+
+
+    /**
+     * 导出
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param request
+     * @return
+     */
+    @RequestMapping(value="/consultant/kpi",method= RequestMethod.POST)
+    public ResponseBean stsConsultantKpiExport(// startDate 默认格式 YYYYMMDD
+                                            @RequestParam(value ="startDate", required = false) String startDate,
+                                            @RequestParam(value ="endDate", required = false) String endDate,
+                                            @RequestParam(value ="buildingId", required = false) String buildingId,
+                                            HttpServletRequest request,
+                                            HttpServletResponse response
+    ){
+        if (null == startDate || "".equals(startDate)) {
+            return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (null == endDate || "".equals(endDate)) {
+            endDate = DateUtils.today();
+        }
+
+        Integer orgId = getOrgId(request);
+        try {
+            response.setContentType("application/octet-stream");
+            response.setCharacterEncoding("utf-8");
+            response.setHeader("Content-disposition", "attachment;filename="+StringUtils.strToUnicode("置业顾问KPI统计")+DateUtils.today()+".xlsx");
+
+            // 汇总明细
+            List<ConsultantKPIExport> result = iTsConsultantKpiService.stsKPIDailyExport(orgId, buildingId, startDate, endDate);
+            ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ConsultantKPIExport.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+            WriteSheet sheet1 = EasyExcel.writerSheet("sheet1").build();
+            excelWriter.write(result, sheet1);
+            excelWriter.finish();
+        } catch (Exception e){
+//            e.printStackTrace();
+            return ResponseBean.error("查询出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return null;
+    }
+
+    private LocalDateTime[] getLocalTimeRangeBy(String startDate, String endDate) throws Exception {
+        LocalDateTime startTime = null;
+        LocalDateTime endTime = null;
+
+        if (!StringUtils.isEmpty(startDate) && !StringUtils.isEmpty(endDate)) {
+            if (startDate.length() != 8 && endDate.length() != 8) {
+                throw new Exception("日期格式必须为YYYYMMDD");
+            }
+
+            startTime = DateUtils.day2LocalDateime(startDate.substring(0,4) + "-" + startDate.substring(4, 6) + "-" + startDate.substring(6, 8));
+            endTime = DateUtils.day2LocalDateime(endDate.substring(0,4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8));
+        }
+
+        return new LocalDateTime[]{startTime, endTime};
+    }
+
+    /**
+     * 查询置业的客户
+     * startDate 存在则统计新增客户, 不存在则统计所有
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/customer")
+    public ResponseBean getConsultantCustomers(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            @RequestParam(value ="buildingId", required = false) String buildingId,
+                                            @RequestParam(value ="userId") String userId,
+                                            @RequestParam(value ="startDate", required = false) String startDate,
+                                            @RequestParam(value ="endDate", required = false) String endDate,
+                                            HttpServletRequest request
+    ){
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaRecommendCustomer> page = new Page<>(pageNum, pageSize);
+        IPage<TaRecommendCustomer> result = iTsConsultantKpiService.getCustomerListOfConsultant(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 置业分享拓客
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/share/customer")
+    public ResponseBean getConsultantShareCustomers(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                    @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                    @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                    @RequestParam(value ="userId") String userId,
+                                                    @RequestParam(value ="startDate", required = false) String startDate,
+                                                    @RequestParam(value ="endDate", required = false) String endDate,
+                                                    HttpServletRequest request) {
+
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantShareCustomers(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 置业首页访问人数
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/homepage/persons")
+    public ResponseBean getConsultantHomePagePersons(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                     @RequestParam(value ="userId") String userId,
+                                                     @RequestParam(value ="startDate", required = false) String startDate,
+                                                     @RequestParam(value ="endDate", required = false) String endDate,
+                                                     HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantHomePagePersons(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 置业首页访问次数
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/homepage/times")
+    public ResponseBean getConsultantHomePageTimes(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                     @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                     @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                     @RequestParam(value ="userId") String userId,
+                                                     @RequestParam(value ="startDate", required = false) String startDate,
+                                                     @RequestParam(value ="endDate", required = false) String endDate,
+                                                   @RequestParam(value ="personId", required = false) String personId,
+                                                     HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantHomePageTimes(page, orgId, userId, buildingId, dateRange[0], dateRange[1], personId);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 咨询置业次数
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/chat/persons")
+    public ResponseBean getConsultantChatPersons(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                 @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                 @RequestParam(value ="userId") String userId,
+                                                 @RequestParam(value ="startDate", required = false) String startDate,
+                                                 @RequestParam(value ="endDate", required = false) String endDate,
+                                                 HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantChatPersons(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 点赞详情
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/favor")
+    public ResponseBean getConsultantFavor(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                 @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                 @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                 @RequestParam(value ="userId") String userId,
+                                                 @RequestParam(value ="startDate", required = false) String startDate,
+                                                 @RequestParam(value ="endDate", required = false) String endDate,
+                                                 HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantFavor(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 置业分享次数
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param targetType
+     * @param targetName
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/share/targets")
+    public ResponseBean getConsultantShareTargets(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                   @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                   @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                   @RequestParam(value ="userId") String userId,
+                                                   @RequestParam(value ="startDate", required = false) String startDate,
+                                                   @RequestParam(value ="endDate", required = false) String endDate,
+                                                  @RequestParam(value ="targetType", required = false) String targetType,
+                                                  @RequestParam(value ="targetName", required = false) String targetName,
+                                                   HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantShareTargets(page, orgId, userId, buildingId, dateRange[0], dateRange[1], targetType, targetName);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 置业分享访问人数
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/share/persons")
+    public ResponseBean getConsultantSharePersons(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                  @RequestParam(value ="userId") String userId,
+                                                  @RequestParam(value ="startDate", required = false) String startDate,
+                                                  @RequestParam(value ="endDate", required = false) String endDate,
+                                                  HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantSharePersons(page, orgId, userId, buildingId, dateRange[0], dateRange[1]);
+        return ResponseBean.success(result);
+    }
+
+    /**
+     * 置业分享访问次数
+     * @param pageNum
+     * @param pageSize
+     * @param buildingId
+     * @param userId
+     * @param startDate
+     * @param endDate
+     * @param targetType
+     * @param targetName
+     * @param request
+     * @return
+     */
+    @GetMapping("/consultant/share/times")
+    public ResponseBean getConsultantShareTimes(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value ="buildingId", required = false) String buildingId,
+                                                  @RequestParam(value ="userId") String userId,
+                                                  @RequestParam(value ="startDate", required = false) String startDate,
+                                                  @RequestParam(value ="endDate", required = false) String endDate,
+                                                  @RequestParam(value ="targetType", required = false) String targetType,
+                                                  @RequestParam(value ="targetName", required = false) String targetName,
+                                                @RequestParam(value ="userName", required = false) String userName,
+                                                @RequestParam(value ="personId", required = false) String personId,
+                                                  HttpServletRequest request) {
+        LocalDateTime[] dateRange = {null, null};
+        try {
+            dateRange = getLocalTimeRangeBy(startDate, endDate);
+        } catch (Exception e) {
+            return ResponseBean.error(e.getMessage(), ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        // 如果 personId 与 userName 同时存在, 以 personId 为准
+        if (!StringUtils.isEmpty(personId)) {
+            userName = null;
+        }
+
+        Integer orgId = getOrgId(request);
+        IPage<TaPerson> page = new Page<>(pageNum, pageSize);
+        IPage<TaPerson> result = iTsConsultantKpiService.getConsultantShareTimes(page, orgId, userId, buildingId, dateRange[0], dateRange[1], targetType, targetName, userName, personId);
+        return ResponseBean.success(result);
+    }
+
+
+}

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -9,35 +9,26 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.drainage.entity.TaDrainage;
-import com.huiju.estateagents.drainage.entity.TaDrainageRecord;
 import com.huiju.estateagents.drainage.service.ITaDrainageRecordService;
 import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.ExtendContent;
 import com.huiju.estateagents.entity.TaMiniapp;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.mapper.TaMiniappMapper;
 import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
-import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.json.YamlJsonParser;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.text.DateFormat;
 import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 
 /**
@@ -89,6 +80,7 @@ public class TaDrainageController extends BaseController {
                                        HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            List<TaPersonBuilding> taPersonBuildingList = getTaPersonBuildingListByUserId(request);
             //使用分页插件
 		    IPage<TaDrainage> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaDrainage> queryWrapper = new QueryWrapper<>();
@@ -100,6 +92,7 @@ public class TaDrainageController extends BaseController {
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
+            queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);
             queryWrapper.orderByDesc("create_date");
 
@@ -141,6 +134,7 @@ public class TaDrainageController extends BaseController {
             if (DateUtils.dayToLocalDateime(taDrainage.getEndDate()).isAfter(LocalDateTime.now())){
                 taDrainage.setStatus(CommConstant.STATUS_NORMAL);
             }
+            taDrainage.setCreateUser(getUserId(request));
             if (iTaDrainageService.save(taDrainage)){
                 // 根据ORGID查询当前小程序表的miniapp_id
                 QueryWrapper<TaMiniapp> taMiniappQuery= new QueryWrapper<>();

src/main/java/com/huiju/estateagents/drainage/entity/TaDrainage.java

@@ -61,6 +61,11 @@ public class TaDrainage implements Serializable {
      */
     private Integer enlistNum;
 
+    /**
+     * 创建人
+     */
+    private Integer createUser;
+
     /** 是否投放小程序 */
     private Boolean isMiniapp ;
     /** H5活动链接 */
@@ -80,4 +85,5 @@ public class TaDrainage implements Serializable {
     
     @TableField(exist = false)
     private String appSecret;
+
 }

src/main/java/com/huiju/estateagents/entity/ExtendContent.java

@@ -1,13 +1,13 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.*;
-
-import java.time.LocalDateTime;
-import java.io.Serializable;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
 /**
  * <p>
  * 辅助内容表 
@@ -99,6 +99,11 @@ public class ExtendContent implements Serializable {
 
     private Integer cityId;
 
+    /**
+     * 创建人id
+     */
+    private Integer createUser;
+
     /**
      * 排序
      */

src/main/java/com/huiju/estateagents/entity/TaPerson.java

@@ -312,4 +312,19 @@ public class TaPerson implements Serializable {
      */
     @TableField(exist = false)
     private String sceneAlias;
+
+    /**
+     * 访问内容类型
+     */
+    private String targetType;
+
+    /**
+     * 访问内容ID
+     */
+    private String targetId;
+
+    /**
+     * 访问内容名称
+     */
+    private String targetName;
 }

src/main/java/com/huiju/estateagents/entity/TaShareCount.java

@@ -43,11 +43,21 @@ public class TaShareCount implements Serializable {
      */
     private String tagertType;
 
+    /**
+     * 对象名称
+     */
+    private String targetName;
+
     /**
      * 创建时间
      */
     private LocalDateTime createDate;
 
+    /**
+     * orgId
+     */
+    private Integer orgId;
+
     @TableField(exist = false)
     private String shareTitle;
 

src/main/java/com/huiju/estateagents/entity/TaSharePersonFrom.java

@@ -56,6 +56,11 @@ public class TaSharePersonFrom implements Serializable {
      */
     private String targetId;
 
+    /**
+     * 目标名称
+     */
+    private String targetName;
+
     /**
      * 创建时间
      */

src/main/java/com/huiju/estateagents/entity/TsConsultantKpi.java

@@ -0,0 +1,117 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 置业顾问KPI 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsConsultantKpi implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 统计日期 格式YYYYMMDD
+     */
+    private String statisDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 置业顾问ID
+     */
+    private Integer userId;
+
+    /**
+     * 置业顾问名称
+     */
+    private String userName;
+
+    /**
+     * 置业顾问手机号
+     */
+    private String phone;
+
+    /**
+     * 新增客户
+     */
+    private Integer newPersons;
+
+    /**
+     * 分享次数
+     */
+    private Integer shareNum;
+
+    /**
+     * 分享访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 分享访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 分享拓客
+     */
+    private Integer sharePersons;
+
+    /**
+     * 主页访问人数
+     */
+    private Integer homePagePersons;
+
+    /**
+     * 主页访问次数
+     */
+    private Integer homePageNums;
+
+    /**
+     * 咨询数
+     */
+    private Integer chatPersons;
+
+    /**
+     * 点赞数
+     */
+    private Integer favorNum;
+
+    /**
+     * 客户总计
+     */
+    @TableField(exist = false)
+    private Integer totalPersons;
+}

src/main/java/com/huiju/estateagents/excel/ConsultantKPIExport.java

@@ -0,0 +1,84 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class ConsultantKPIExport {
+
+    /**
+     * 楼盘名称
+     */
+    @ExcelProperty(value = "项目", index = 0)
+    private String buildingName;
+
+
+    /**
+     * 置业顾问名称
+     */
+    @ExcelProperty(value = "置业顾问名称", index = 1)
+    private String userName;
+
+    /**
+     * 置业顾问手机号
+     */
+    @ExcelProperty(value = "置业顾问电话", index = 2)
+    private String phone;
+
+    @ExcelProperty(value = "客户总计", index = 3)
+    private Integer totalPersons;
+
+    /**
+     * 新增客户
+     */
+    @ExcelProperty(value = "新增客户数", index = 4)
+    private Integer newPersons;
+
+    /**
+     * 分享次数
+     */
+    @ExcelProperty(value = "分享次数", index = 5)
+    private Integer shareNum;
+
+    /**
+     * 分享访问人数
+     */
+    @ExcelProperty(value = "访问人数", index = 6)
+    private Integer visitPersons;
+
+    /**
+     * 分享访问次数
+     */
+    @ExcelProperty(value = "访问次数", index = 7)
+    private Integer visitNum;
+
+    /**
+     * 分享拓客
+     */
+    @ExcelProperty(value = "分享拓客数", index = 8)
+    private Integer sharePersons;
+
+    /**
+     * 主页访问人数
+     */
+    @ExcelProperty(value = "访问主页人数", index = 9)
+    private Integer homePagePersons;
+
+    /**
+     * 主页访问次数
+     */
+    @ExcelProperty(value = "访问主页次数", index = 10)
+    private Integer homePageNums;
+
+    /**
+     * 咨询数
+     */
+    @ExcelProperty(value = "咨询数", index = 11)
+    private Integer chatPersons;
+
+    /**
+     * 点赞数
+     */
+    @ExcelProperty(value = "点赞数", index = 12)
+    private Integer favorNum;
+}

src/main/java/com/huiju/estateagents/excel/IntentionUser.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class IntentionUser {
+
+    /**
+     * 用户姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String personName;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 意向楼盘
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向楼盘", index = 2)
+    private String buildingName;
+
+    /**
+     * 意向值
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向值", index = 3)
+    private Integer intention;
+
+}

src/main/java/com/huiju/estateagents/mapper/TaPersonIntentionRecordMapper.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+import com.huiju.estateagents.excel.IntentionUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,4 +36,6 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
                                                    @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    List<IntentionUser> selectExportIntentionUser(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId,@Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

src/main/java/com/huiju/estateagents/mapper/TaPersonMapper.java

@@ -1,17 +1,15 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.po.PersonPO;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.*;
 
-import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -249,4 +247,11 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer savePersonPosition(TaPersonPositon record);
+
+    /**
+     * 今日新增人数
+     * @param orgId
+     * @return
+     */
+    Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
 }

src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java

@@ -191,4 +191,11 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
     List<PersonIntention> getCustomerIntentions(@Param("personId")String personId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     IPage<TaRecommendCustomer>getCustomersIRecommended(IPage<TaRecommendCustomer> page,@Param("customerId")String customerId,@Param("status")Integer status,@Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page,
+                                                           @Param("orgId") Integer orgId,
+                                                           @Param("userId") String userId,
+                                                           @Param("buildingId") String buildingId,
+                                                           @Param("startDate") LocalDateTime startDate,
+                                                           @Param("endDate") LocalDateTime endDate);
 }

src/main/java/com/huiju/estateagents/mapper/TsConsultantKpiMapper.java

@@ -0,0 +1,197 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPerson;
+import com.huiju.estateagents.entity.TaShareCount;
+import com.huiju.estateagents.entity.TsConsultantKpi;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 置业顾问KPI  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-14
+ */
+@Mapper
+public interface TsConsultantKpiMapper extends BaseMapper<TsConsultantKpi> {
+
+    IPage<TsConsultantKpi> stsKPIDaily(IPage<TsConsultantKpi> page,
+                                       @Param("orgId") Integer orgId,
+                                       @Param("buildingId") String buildingId,
+                                       @Param("startDate") String startDate,
+                                       @Param("endDate") String endDate,
+                                       @Param("asc") String asc,
+                                       @Param("desc") String desc);
+
+    TsConsultantKpi stsKPITotalByOrg(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    List<ConsultantKPIExport> stsKPIDailyExport(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+    /**
+     * 统计当前时间段内的, 已经固化的置业数据的所有客户
+     * @param orgId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    Integer stsAllCustomersByOrg(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("startDate") String startDate, @Param("endDate") String endDate);
+
+
+    /**
+     * 获取置业分享拓客
+     * buildingId 暂时没有用到
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<TaPerson> getConsultantShareCustomers(IPage<TaPerson> page,
+                                              @Param("orgId") Integer orgId,
+                                              @Param("userId") String userId,
+                                              @Param("buildingId") String buildingId,
+                                              @Param("startDate") LocalDateTime startDate,
+                                              @Param("endDate") LocalDateTime endDate);
+
+    /**
+     * 置业卡片访问人数明细
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<TaPerson> getConsultantHomePagePersons(IPage<TaPerson> page,
+                                                 @Param("orgId") Integer orgId,
+                                                 @Param("userId") String userId,
+                                                 @Param("buildingId") String buildingId,
+                                                 @Param("startDate") LocalDateTime startDate,
+                                                 @Param("endDate") LocalDateTime endDate);
+
+    /**
+     * 置业卡片访问次数明细
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page,
+                                               @Param("orgId") Integer orgId,
+                                               @Param("userId") String userId,
+                                               @Param("buildingId") String buildingId,
+                                               @Param("startDate") LocalDateTime startDate,
+                                               @Param("endDate") LocalDateTime endDate,
+                                               @Param("personId") String personId);
+
+    /**
+     * 咨询置业人员
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<TaPerson> getConsultantChatPersons(IPage<TaPerson> page,
+                                             @Param("orgId") Integer orgId,
+                                             @Param("userId") String userId,
+                                             @Param("buildingId") String buildingId,
+                                             @Param("startDate") LocalDateTime startDate,
+                                             @Param("endDate") LocalDateTime endDate);
+
+    /**
+     * 点赞详情
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<TaPerson> getConsultantFavor(IPage<TaPerson> page,
+                                       @Param("orgId") Integer orgId,
+                                       @Param("userId") String userId,
+                                       @Param("buildingId") String buildingId,
+                                       @Param("startDate") LocalDateTime startDate,
+                                       @Param("endDate") LocalDateTime endDate);
+
+
+    /**
+     * 置业分享记录
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @param targetType
+     * @param targetName
+     * @return
+     */
+    IPage<TaPerson> getConsultantShareTargets(IPage<TaPerson> page,
+                                                  @Param("orgId") Integer orgId,
+                                                  @Param("userId") String userId,
+                                                  @Param("buildingId") String buildingId,
+                                                  @Param("startDate") LocalDateTime startDate,
+                                                  @Param("endDate") LocalDateTime endDate,
+                                                  @Param("targetType") String targetType,
+                                                  @Param("targetName") String targetName);
+
+    /**
+     * 置业分享访问人
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    IPage<TaPerson> getConsultantSharePersons(IPage<TaPerson> page,
+                                              @Param("orgId") Integer orgId,
+                                              @Param("userId") String userId,
+                                              @Param("buildingId") String buildingId,
+                                              @Param("startDate") LocalDateTime startDate,
+                                              @Param("endDate") LocalDateTime endDate);
+
+    /**
+     * 置业分享访问明细
+     * @param page
+     * @param orgId
+     * @param userId
+     * @param buildingId
+     * @param startDate
+     * @param endDate
+     * @param targetType
+     * @param targetName
+     * @return
+     */
+    IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page,
+                                            @Param("orgId") Integer orgId,
+                                            @Param("userId") String userId,
+                                            @Param("buildingId") String buildingId,
+                                            @Param("startDate") LocalDateTime startDate,
+                                            @Param("endDate") LocalDateTime endDate,
+                                            @Param("targetType") String targetType,
+                                            @Param("targetName") String targetName,
+                                            @Param("userName") String userName,
+                                            @Param("personId") String personId);
+}

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 
@@ -196,4 +197,22 @@ public interface IStatisticalService {
      * @return
      */
     List<StatsTimeBuilding> getExportTimeTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 意向客户导出
+     * @param orgId
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<IntentionUser> getExportIntentionUser(Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 新调整--新增用户
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

src/main/java/com/huiju/estateagents/service/ITsConsultantKpiService.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.*;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 置业顾问KPI  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-14
+ */
+public interface ITsConsultantKpiService extends IService<TsConsultantKpi> {
+
+    IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startDate, String endDate, String asc, String desc);
+
+    TsConsultantKpi stsKPITotalByOrg(Integer orgId, String buildingId, String startDate, String endDate);
+
+    List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, String buildingId, String startDate, String endDate);
+
+    IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaPerson> getConsultantShareCustomers(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaPerson> getConsultantHomePagePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String personId);
+
+    IPage<TaPerson> getConsultantChatPersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaPerson> getConsultantFavor(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaPerson> getConsultantShareTargets(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName);
+
+    IPage<TaPerson> getConsultantSharePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate);
+
+    IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName, String userName, String personId);
+}

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

@@ -8,6 +8,7 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
+import com.huiju.estateagents.excel.IntentionUser;
 import com.huiju.estateagents.excel.StatsBuilding;
 import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.mapper.*;
@@ -20,6 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
 import java.util.ArrayList;
@@ -74,8 +76,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
         // 注册数
         Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
-        // 最近七天
-        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        // 最近七天--> 调整为今日新增
+        Integer selectRecentlyCount = taPersonMapper.selectTodayRecentlyCount(orgId, LocalDateTime.now());
 
         // -------  用户来源 end ------------
 
@@ -550,6 +552,33 @@ public class StatisticalServiceImpl implements IStatisticalService {
         return taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId);
     }
 
+    /**
+     * 意向客户导出
+     *
+     * @param orgId
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<IntentionUser> getExportIntentionUser(Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taPersonIntentionRecordMapper.selectExportIntentionUser(orgId, buildingId, taPersonBuildingListByUserId);
+    }
+
+    /**
+     * 新调整--新增用户
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate);
+        return ResponseBean.success(tableList);
+    }
+
     /**
      * 项目公客排行折线图获取
      * @param orgId

src/main/java/com/huiju/estateagents/service/impl/TaShareServiceImpl.java

@@ -79,6 +79,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         taShareCount.setCreateDate(LocalDateTime.now());
         taShareCount.setPersonId(taPerson.getPersonId());
         taShareCount.setTagertType(typeOf);
+        taShareCount.setOrgId(taPerson.getOrgId());
         int countRow = taShareCountMapper.insert(taShareCount);
         if (countRow < 1) {
             return ResponseBean.error("分享增加失败", ResponseBean.ERROR_UNAVAILABLE);

src/main/java/com/huiju/estateagents/service/impl/TsConsultantKpiServiceImpl.java

@@ -0,0 +1,111 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.mapper.TaRecommendCustomerMapper;
+import com.huiju.estateagents.mapper.TsConsultantKpiMapper;
+import com.huiju.estateagents.service.ITsConsultantKpiService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 置业顾问KPI  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-14
+ */
+@Service
+public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMapper, TsConsultantKpi> implements ITsConsultantKpiService {
+    @Autowired
+    TsConsultantKpiMapper tsConsultantKpiMapper;
+
+    @Autowired
+    TaRecommendCustomerMapper taRecommendCustomerMapper;
+
+    @Override
+    public IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, String buildingId, String startDate, String endDate, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            desc = "new_persons";
+        }
+
+        IPage<TsConsultantKpi> page = new Page<>(pageNum, pageSize);
+        return tsConsultantKpiMapper.stsKPIDaily(page, orgId, buildingId, startDate, endDate, asc, desc);
+    }
+
+    @Override
+    public TsConsultantKpi stsKPITotalByOrg(Integer orgId, String buildingId, String startDate, String endDate) {
+        // 合计数据, 但是不包含 客户总计 列
+        TsConsultantKpi result = tsConsultantKpiMapper.stsKPITotalByOrg(orgId, buildingId, startDate, endDate);
+
+        // 统计当前时间段内的已经固化的置业的客户
+        Integer totalPersons = tsConsultantKpiMapper.stsAllCustomersByOrg(orgId, buildingId, startDate, endDate);
+        result.setTotalPersons(totalPersons);
+
+        return result;
+    }
+
+    @Override
+    public List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, String buildingId, String startDate, String endDate) {
+        return tsConsultantKpiMapper.stsKPIDailyExport(orgId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantShareCustomers(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
+        return tsConsultantKpiMapper.getConsultantShareCustomers(page, orgId, userId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantHomePagePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        return tsConsultantKpiMapper.getConsultantHomePagePersons(page, orgId, userId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantHomePageTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String personId) {
+        return tsConsultantKpiMapper.getConsultantHomePageTimes(page, orgId, userId, buildingId, startDate, endDate, personId);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantChatPersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        // buildingId 在聊天表不存在, 因此没有用到这个字段
+        return tsConsultantKpiMapper.getConsultantChatPersons(page, orgId, userId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantFavor(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        // buildingId 在点赞表不存在, 因此没有用到这个字段
+        return tsConsultantKpiMapper.getConsultantFavor(page, orgId, userId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantShareTargets(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName) {
+        return tsConsultantKpiMapper.getConsultantShareTargets(page, orgId, userId, buildingId, startDate, endDate, targetType, targetName);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantSharePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
+        return tsConsultantKpiMapper.getConsultantSharePersons(page, orgId, userId, buildingId, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName, String userName, String personId) {
+        // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
+        return tsConsultantKpiMapper.getConsultantShareTimes(page, orgId, userId, buildingId, startDate, endDate, targetType, targetName, userName, personId);
+    }
+
+}

src/main/java/com/huiju/estateagents/statistic/mapper/TsPersonFromStatisticMapper.java

@@ -28,4 +28,6 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
     List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     void deleteByData();
+
+    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

src/main/resources/application-blue.yml

@@ -6,7 +6,7 @@ spring:
   datasource:
     username: root
     password: LUfZGvh7j1^qA*2c
-    url: jdbc:mysql://123.57.65.31:3306/estateagents_test?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
+    url: jdbc:mysql://123.57.65.31:3306/estateagents_20200417?useUnicode=true&serverTimezone=GMT%2B8&characterEncoding=utf8&allowMultiQueries=true&autoReconnect=true&zeroDateTimeBehavior=convertToNull
     driver-class-name: com.mysql.cj.jdbc.Driver
     initial-size: 10 # 初始化连接数
     max-active: 20 # 最大连接数

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -42,4 +42,32 @@
             tpir.person_id, tpir.building_id
         ORDER BY SUM(tpir.intention) DESC
     </select>
+    <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
+        SELECT
+        tpir.person_name as  person_name,
+        tp.phone as phone,
+        tpir.building_name as building_name,
+        SUM(tpir.intention) as intention
+        FROM
+        ta_person_intention_record tpir
+        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="buildingId != null and buildingId != ''">
+                tpir.building_id = #{buildingId}
+            </if>
+            <if test="orgId != null">
+                AND tpir.org_id = #{orgId}
+                AND tp.org_id = #{orgId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND tpir.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+        </trim>
+        GROUP BY
+        tpir.person_id, tpir.building_id
+        ORDER BY SUM(tpir.intention) DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -605,6 +605,15 @@ FROM
             </if>
                 GROUP BY t.person_id) d
     </select>
+    <select id="selectTodayRecentlyCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(1) as activity_count
+        FROM
+        ta_person tp
+        where tp.org_id = #{orgId} AND
+        tp.person_type IN ('customer','drift','estate agent')
+        AND DATE_FORMAT(tp.create_date,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -823,4 +823,21 @@ FROM
         </if>
     </select>
 
+    <select id="getCustomerListOfConsultant" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
+        select s.*, t.avatarurl
+        from ta_recommend_customer s
+        left join ta_person t on t.person_id = s.person_id
+        where s.org_id = #{orgId}
+        and s.realty_consultant = #{userId}
+        <if test="startDate != null">
+            and s.create_date BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="buildingId != null and buildingId !=''">
+        and s.building_id = #{buildingId}
+        </if>
+        and s.status &gt; 0
+        order by s.report_date desc
+    </select>
+
+
 </mapper>

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -0,0 +1,356 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TsConsultantKpiMapper">
+
+    <!-- 按照项目, 置业分组统计, 注意查询与分组条件, 必须与下面的汇总，导出一致 -->
+    <select id="stsKPIDaily" resultType="com.huiju.estateagents.entity.TsConsultantKpi">
+        SELECT * FROM (
+            SELECT
+                1 AS serial_no,
+                '2020' AS statis_date,
+                t.org_id,
+                t.building_id,
+                t.building_name,
+                t.user_id,
+                t.user_name,
+                t.phone,
+                IFNULL(sum( t.new_persons ),0) AS new_persons,
+                IFNULL(sum( t.share_num ),0) AS share_num,
+                IFNULL(sum( t.visit_persons ),0) AS visit_persons,
+                IFNULL(sum( t.visit_num ),0) AS visit_num,
+                IFNULL(sum( t.share_persons ),0) AS share_persons,
+                IFNULL(sum( t.home_page_persons ),0) AS home_page_persons,
+                IFNULL(sum( t.home_page_nums ),0) AS home_page_nums,
+                IFNULL(sum( t.chat_persons ),0) AS chat_persons,
+                IFNULL(sum( t.favor_num ),0) AS favor_num,
+                (select count(DISTINCT s.customer_id) from ta_recommend_customer s
+                 where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id) and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '') and s.status > 0) as total_persons
+            FROM
+                ts_consultant_kpi t
+            LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
+            WHERE
+                t.org_id = #{orgId}
+                AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+            <if test="buildingId != null and buildingId != ''">
+                AND t.building_id = #{buildingId}
+            </if>
+            GROUP BY
+                t.user_id,
+                t.building_id
+        ) a
+
+        <if test="asc != null and asc != ''">
+            ORDER BY ${asc} asc
+        </if>
+        <if test="desc != null and desc != ''">
+            ORDER BY ${desc} desc
+        </if>
+    </select>
+
+    <!-- 按照小程序分组统计, 注意查询与分组条件, 必须与之前的汇总，导出一致 -->
+    <select id="stsKPITotalByOrg" resultType="com.huiju.estateagents.entity.TsConsultantKpi">
+        SELECT
+            1 AS serial_no,
+            '2020' AS statis_date,
+            t.org_id,
+            '' as building_id,
+            '-' as building_name,
+            0 as user_id,
+            '-' as user_name,
+            IFNULL(sum( t.new_persons ),0) AS new_persons,
+            IFNULL(sum( t.share_num ),0) AS share_num,
+            IFNULL(sum( t.visit_persons ),0) AS visit_persons,
+            IFNULL(sum( t.visit_num ),0) AS visit_num,
+            IFNULL(sum( t.share_persons ),0) AS share_persons,
+            IFNULL(sum( t.home_page_persons ),0) AS home_page_persons,
+            IFNULL(sum( t.home_page_nums ),0) AS home_page_nums,
+            IFNULL(sum( t.chat_persons ),0) AS chat_persons,
+            IFNULL(sum( t.favor_num ),0) AS favor_num,
+
+            <!-- 这一列单独统计 -->
+            0 as total_persons
+        FROM
+            ts_consultant_kpi t
+        WHERE
+            t.org_id = #{orgId}
+            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+    </select>
+
+    <!-- 导出 -->
+    <select id="stsKPIDailyExport" resultType="com.huiju.estateagents.excel.ConsultantKPIExport">
+        SELECT
+            1 AS serial_no,
+            '2020' AS statis_date,
+            t.org_id,
+            t.building_id,
+            t.building_name,
+            t.user_id,
+            t.user_name,
+            t.phone,
+            IFNULL(sum( t.new_persons ),0) AS new_persons,
+            IFNULL(sum( t.share_num ),0) AS share_num,
+            IFNULL(sum( t.visit_persons ),0) AS visit_persons,
+            IFNULL(sum( t.visit_num ),0) AS visit_num,
+            IFNULL(sum( t.share_persons ),0) AS share_persons,
+            IFNULL(sum( t.home_page_persons ),0) AS home_page_persons,
+            IFNULL(sum( t.home_page_nums ),0) AS home_page_nums,
+            IFNULL(sum( t.chat_persons ),0) AS chat_persons,
+            IFNULL(sum( t.favor_num ),0) AS favor_num,
+            (select count(DISTINCT s.customer_id) from ta_recommend_customer s
+             where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id) and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '') and s.status > 0) as total_persons
+        FROM
+            ts_consultant_kpi t
+        LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
+        WHERE
+            t.org_id = #{orgId}
+        AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+        GROUP BY
+            t.user_id,
+            t.building_id
+        ORDER BY sum( new_persons ) desc
+    </select>
+
+    <select id="stsAllCustomersByOrg" resultType="java.lang.Integer">
+        SELECT
+            count(DISTINCT p.customer_id)
+        FROM
+            ta_recommend_customer p
+        INNER JOIN ta_person s ON s.org_id = p.org_id
+            AND ( p.realty_consultant = s.user_id OR p.realty_consultant = s.person_id )
+        INNER JOIN ts_consultant_kpi t ON t.org_id = s.org_id
+            AND t.user_id = s.user_id
+            AND ( t.building_id = p.building_id OR IFNULL( t.building_id, '' ) = '' )
+        WHERE
+            p.org_id = #{orgId}
+            AND p.`status` > 0
+            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+        <if test="buildingId != null and buildingId != ''">
+            AND t.building_id = #{buildingId}
+        </if>
+    </select>
+
+    <select id="getConsultantShareCustomers" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+        t.*
+        FROM ta_share_person_from e
+        INNER JOIN ta_person t ON t.person_id = e.person_id
+        WHERE e.org_id = #{orgId}
+        AND e.share_person = #{userId}
+        AND e.create_date BETWEEN #{startDate} and #{endDate}
+        <!-- building_id 字段数据不全
+        <if test="buildingId != null and buildingId !=''">
+            AND e.building_id = #{buildingId}
+        </if>
+        -->
+        AND e.is_first_time = 1
+
+        AND t.phone is not null
+
+<!--        为了与存储过程一致 -->
+<!--        AND t.`status` = 1-->
+        ORDER BY e.create_date DESC
+    </select>
+
+    <select id="getConsultantHomePagePersons" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            count( * ) as visit_times,
+            MAX(f.visit_time) as visit_time
+        FROM
+            ta_person t
+        INNER JOIN ta_person_visit_record f ON f.org_id = #{orgId} AND f.person_id = t.person_id
+        INNER JOIN ta_person s on s.person_id = f.target_id
+        WHERE t.org_id = #{orgId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND t.`status` = 1-->
+        <if test="buildingId != null and buildingId !=''">
+            AND f.building_id = #{buildingId}
+        </if>
+            AND f.event_type = 'card'
+            AND f.visit_time BETWEEN #{startDate} and #{endDate}
+            AND s.user_id = #{userId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND s.`status` = 1-->
+        GROUP BY t.person_id, DATE_FORMAT(t.create_date, '%Y%m%d')
+        ORDER BY t.create_date DESC
+    </select>
+
+    <select id="getConsultantHomePageTimes" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            f.visit_time as visit_time
+        FROM
+            ta_person t
+        INNER JOIN ta_person_visit_record f ON f.org_id = #{orgId} AND f.person_id = t.person_id
+        INNER JOIN ta_person s on s.person_id = f.target_id
+        WHERE t.org_id = #{orgId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND t.`status` = 1-->
+        <if test="buildingId != null and buildingId !=''">
+            AND f.building_id = #{buildingId}
+        </if>
+            AND f.event_type = 'card'
+            AND f.visit_time BETWEEN #{startDate} and #{endDate}
+            AND s.user_id = #{userId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND s.`status` = 1-->
+        <if test="personId != null and personId !=''">
+            AND t.person_id = #{personId}
+        </if>
+        ORDER BY t.create_date DESC
+    </select>
+
+    <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            max( h.create_date ) AS visit_time
+        FROM
+            ta_person t
+        INNER JOIN ta_chat h ON h.send_person = t.person_id
+        INNER JOIN ta_person s ON s.person_id = h.receive_person
+        WHERE t.org_id = #{orgId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND t.`status` = 1-->
+            AND h.create_date BETWEEN #{startDate} and #{endDate}
+            AND s.user_id = #{userId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND s.`status` = 1-->
+        GROUP BY
+            t.person_id, DATE_FORMAT(h.create_date, '%Y%m%d')
+        ORDER BY
+            h.create_date DESC
+    </select>
+
+    <select id="getConsultantFavor" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            i.create_date AS visit_time
+        FROM
+            ta_person t
+        INNER JOIN ta_favor i ON i.person_id = t.person_id
+        INNER JOIN ta_person s ON s.person_id = i.be_favor
+        WHERE t.org_id = #{orgId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND t.`status` = 1-->
+            AND i.tagert_type = 'consultant'
+            AND i.create_date BETWEEN #{startDate} and #{endDate}
+            AND s.user_id = #{userId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND s.`status` = 1-->
+        ORDER BY
+            i.create_date DESC
+    </select>
+
+    <select id="getConsultantShareTargets" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            s.*,
+            t.tagert_type as target_type,
+            t.target_name,
+            t.be_share as target_id,
+            t.create_date as visit_time
+        FROM
+            ta_share_count t
+        INNER JOIN ta_person s ON s.person_id = t.person_id
+        WHERE
+            t.org_id = #{orgId}
+
+        <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
+        <if test="targetType == null or targetType ==''">
+            AND (
+            t.tagert_type IN ( 'project', 'activity', 'group', 'h5', 'help', 'news', 'main' )
+            OR t.tagert_type like 'house%'
+            OR t.tagert_type like 'live%'
+            )
+        </if>
+        <if test="targetType != null and targetType !=''">
+            AND t.tagert_type like concat(#{targetType}, '%')
+        </if>
+
+            AND t.create_date BETWEEN #{startDate} and #{endDate}
+        <if test="targetName != null and targetName !=''">
+            AND t.target_name LIKE concat('%', #{targetName}, '%')
+        </if>
+            AND s.user_id = #{userId}
+
+<!--        为了与存储过程一致 -->
+<!--            AND s.`status` = 1-->
+        ORDER BY t.create_date DESC
+    </select>
+
+    <select id="getConsultantSharePersons" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            count(*) as visit_times,
+            max(e.create_date) as visit_time
+        FROM ta_share_person_from e
+        INNER JOIN ta_person t ON t.person_id = e.person_id
+        WHERE e.org_id = #{orgId}
+            AND e.share_person = #{userId}
+            AND e.create_date BETWEEN #{startDate} and #{endDate}
+            <!-- building_id 字段数据不全
+            <if test="buildingId != null and buildingId !=''">
+                AND e.building_id = #{buildingId}
+            </if>
+            -->
+<!--            AND t.`status` = 1-->
+        GROUP BY t.person_id, DATE_FORMAT(e.create_date, '%Y%m%d')
+        ORDER BY e.create_date DESC
+    </select>
+
+    <select id="getConsultantShareTimes" resultType="com.huiju.estateagents.entity.TaPerson">
+        SELECT
+            t.*,
+            e.create_date as visit_time,
+            e.target_type,
+            e.target_id,
+            e.target_name
+        FROM ta_share_person_from e
+        INNER JOIN ta_person t ON t.person_id = e.person_id
+        WHERE e.org_id = #{orgId}
+            AND e.share_person = #{userId}
+
+        <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
+        <if test="targetType == null or targetType ==''">
+            AND (
+            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share' )
+            OR ( e.target_type = 'share' AND e.target_id = 'index' )
+            )
+        </if>
+        <if test="targetType != null and targetType !=''">
+            AND e.target_type = 'share'
+        </if>
+        <if test="targetType != null and targetType =='share'">
+            AND e.target_id = 'index'
+        </if>
+
+            AND e.create_date BETWEEN #{startDate} and #{endDate}
+            <!-- building_id 字段数据不全
+            <if test="buildingId != null and buildingId !=''">
+                AND e.building_id = #{buildingId}
+            </if>
+            -->
+
+        <if test="personId != null and personId !=''">
+            AND t.person_id = #{personId}
+        </if>
+        <if test="userName != null and userName !=''">
+            AND t.nickname like concat('%', #{userName} ,'%')
+        </if>
+            <!--            AND t.`status` = 1-->
+        ORDER BY e.create_date DESC
+    </select>
+</mapper>

src/main/resources/mapper/statistic/TsPersonFromStatisticMapper.xml

@@ -65,5 +65,29 @@
         GROUP BY
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
         tp.scene_type
+        ORDER BY tp.create_date
+    </select>
+    <select id="selectNewLinePersonFromGroupByData"
+            resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+        sum( tp.from_num ) AS from_num,
+        sum( tp.registered_num ) AS registered_num,
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
+        tp.scene_type
+        FROM
+        ts_person_from_statistic tp
+        WHERE
+        tp.org_id = #{orgId}
+        and tp.scene_type != ''
+        and tp.scene_type is not null
+        <if test="startDate != null or endDate != null">
+            AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+        GROUP BY
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
+        ORDER BY tp.create_date
     </select>
 </mapper>