Merge branch 'dev'

# Conflicts:
#	src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java
#	src/main/resources/mapper/TaShareMapper.xml

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.19</version>
+	<version>v3.5.21</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/bo/request/ActivityStatisticResponseBO.java

@@ -0,0 +1,44 @@
+package com.huiju.estateagents.bo.request;
+
+import lombok.Data;
+
+/**
+ * 活动统计返回实体
+ *
+ * @author gusy
+ * @date 2020/4/26 13:15
+ */
+@Data
+public class ActivityStatisticResponseBO {
+
+    /**
+     * 活动分享人数
+     */
+    private Integer sharePersons;
+
+    /**
+     * 活动分享次数
+     */
+    private Integer shareNum;
+
+    /**
+     * 活动访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 活动访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 分享新增用户
+     */
+    private Integer newPersons;
+
+    /**
+     * 分享新增客户
+     */
+    private Integer newCustomers;
+
+}

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -2,33 +2,28 @@ package com.huiju.estateagents.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 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.sysUser.entity.SysToken;
-import com.huiju.estateagents.center.sysUser.entity.SysUser;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.entity.TaUserRole;
-import com.huiju.estateagents.center.taUser.service.ITaTagUserService;
-import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
-import com.huiju.estateagents.center.taUser.service.ITaUserAuthMenuService;
-import com.huiju.estateagents.center.taUser.service.ITaUserRoleService;
-import com.huiju.estateagents.center.taUser.service.ITaUserService;
+import com.huiju.estateagents.center.taUser.service.*;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.MD5Utils;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.mapper.TaRoleMapper;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaPersonBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaRoleService;
@@ -38,7 +33,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -88,6 +82,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaPersonService iTaPersonService;
 
+    @Autowired
+    private ITaMiniappService iTaMiniappService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -294,10 +291,15 @@ public class TaUserController extends BaseController {
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
             ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
+            taMiniappQueryWrapper.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);
+
             taUser.setMenus((List<SysMenu>) authMenu.getData());
             taUser.setButtons((List<SysButtonInMenu>) authButton.getData());
             taUser.setRoles(roles);
             taUser.setLoginPassword("");
+            taUser.setMiniAppName(taMiniapp.getName());
 
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
@@ -361,7 +363,7 @@ public class TaUserController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put("token", token);
         result.put("user", taUser);
-    
+
         return ResponseBean.success(result);
     }
     
@@ -388,6 +390,7 @@ public class TaUserController extends BaseController {
                                    @RequestParam(value ="phone",required = false) String phone,
                                    @RequestParam(value ="status",required = false) Integer status,
                                    @RequestParam(value ="isConsultant",required = false) Integer isConsultant,
+                                   @RequestParam(value ="miniStatus",required = false) Integer miniStatus,
                                    @RequestParam(value ="buildingId",required = false) String buildingId,
                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
@@ -405,6 +408,7 @@ public class TaUserController extends BaseController {
             }else if (null != isConsultant && isConsultant == 0){
                 taUser.setIsConsultant(false);
             }
+            taUser.setMiniStatus(miniStatus);
 
             IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
             List<TaUser> taUserList = result.getRecords();
@@ -412,8 +416,8 @@ public class TaUserController extends BaseController {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
                 e.setTaTagsList(taTagsList);
 
-                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
-                e.setMiniStatus(0 == person ? 0 : 1);
+//                Integer person = iTaPersonService.judgeBindStatusByCondition(e.getUserId(), getOrgId(request), e.getPhone());
+//                e.setMiniStatus(0 == person ? 0 : 1);
             });
             result.setRecords(taUserList);
             responseBean.addSuccess(result);

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -232,4 +232,7 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private List<TaPerson> personIds;
+
+    @TableField(exist = false)
+    private String miniAppName;
 }

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -33,4 +33,8 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
     Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
 
     TaUser getAdminByAppID(@Param("appid") String appID);
+
+    List<String> getBuildingIdsOf(@Param("userId") Integer userId,@Param("buildingId") String buildingId);
+
+    TaUser getUserByPerson(@Param("orgId") Integer orgId, @Param("personId") String personId);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -4,7 +4,6 @@ import cn.binarywang.wx.miniapp.api.WxMaService;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTagUser;
@@ -25,13 +24,11 @@ import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.map.HashedMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -356,6 +353,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             throw new Exception("未找到有效的用户信息");
         }
 
+        //停用
+        if (!isOn){
+            //查看是否置业顾问
+            if (taUser.getIsConsultant()){
+                taUser.setIsConsultant(false);
+                taUserMapper.updateById(taUser);
+                //小程序端调整为普通客户
+                QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+                taPersonQueryWrapper.eq("user_id",id);
+                taPersonQueryWrapper.eq("org_id",taUser.getOrgId());
+                TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+                if (null != taPerson){
+                    taPerson.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+                    taPersonMapper.updateById(taPerson);
+                }
+            }
+        }
+
         Integer status = isOn ? CommConstant.STATUS_NORMAL : CommConstant.STATUS_CLOSED;
         TaUser user = new TaUser();
         user.setStatus(status);

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

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.common;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.util.List;
+
+public class ExcelUtils {
+
+    /**
+     * 发送 excel 到客户端
+     * 暂时只支持单 sheet 页
+     * @param response
+     * @param data
+     * @param fileName
+     * @throws IOException
+     */
+    public static void flush(HttpServletResponse response, Class dataClass, List data, String fileName) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename="+StringUtils.strToUnicode(fileName)+".xlsx");
+
+//        ParameterizedType type = (ParameterizedType) data.getClass().getGenericSuperclass();
+//        Class dataClass = (Class) type.getActualTypeArguments()[0];
+
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), dataClass).registerWriteHandler(new CustomCellWriteHandler()).build();
+        WriteSheet sheet1 = EasyExcel.writerSheet("sheet1").build();
+        excelWriter.write(data, sheet1);
+        excelWriter.finish();
+    }
+}

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/ActivityManageController.java

@@ -0,0 +1,65 @@
+package com.huiju.estateagents.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.huiju.estateagents.base.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.service.impl.ActivityManageServiceImpl;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.servlet.http.HttpServletRequest;
+
+/**
+ * 活动管理
+ *
+ * @author gusy
+ * @date 2020/4/26 10:42
+ */
+@Controller
+@RequestMapping("/api")
+public class ActivityManageController extends BaseController {
+
+    private Logger logger = LoggerFactory.getLogger(ActivityManageController.class);
+
+    @Autowired
+    private ActivityManageServiceImpl activityManageService;
+
+    /**
+     * 根据类型获取统计数据
+     *
+     * @param type 报名活动:activity、
+     *             H5:h5、
+     *             助力:help、
+     *             拼团:group、
+     *             直播:live
+     * @return
+     */
+    @RequestMapping(value = "/admin/activityManage/getStatisticData", method = RequestMethod.GET)
+    @ResponseBody
+    public ResponseBean getStatisticDataByType(String type, String id, HttpServletRequest request) {
+        logger.info("getStatisticDataByType 接收参数：type：{}，id：{}", type, id);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        // 校验参数
+        if (StringUtils.isBlank(type) || StringUtils.isBlank(id)) {
+            responseBean.addError("参数错误");
+            return responseBean;
+        }
+
+        try {
+            responseBean = activityManageService.getStatisticDataByType(type, id,getOrgId(request));
+            logger.info("getStatisticDataByType 返回结果：{}", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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/MiniAppController.java

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.controller;
 
-import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
 import cn.binarywang.wx.miniapp.bean.WxMaPhoneNumberInfo;
 import cn.binarywang.wx.miniapp.bean.WxMaUserInfo;
@@ -8,22 +7,20 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
-import com.huiju.estateagents.center.sysUser.entity.SysToken;
 import com.huiju.estateagents.center.sysUser.service.ISysTokenService;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.WxUtils;
+import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.drainage.entity.TaDrainage;
+import com.huiju.estateagents.drainage.service.ITaDrainageService;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.TaOrgCityMapper;
-import com.huiju.estateagents.mapper.TaShareMapper;
+import com.huiju.estateagents.mapper.TaSalesBatchMapper;
 import com.huiju.estateagents.service.*;
-import com.huiju.estateagents.common.JWTUtils;
-import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
 import me.chanjar.weixin.common.error.WxErrorException;
-import net.bytebuddy.asm.Advice;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpStatus;
@@ -36,7 +33,6 @@ import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -103,6 +99,21 @@ public class MiniAppController extends BaseController {
     @Autowired
     public ITdCityService iTdCityService;
 
+    @Autowired
+    private IHelpActivityService helpActivityService;
+
+    @Autowired
+    private ITaShareActivityService taShareActivityService;
+
+    @Autowired
+    private ITaLiveActivityService taLiveActivityService;
+
+    @Autowired
+    private ITaDrainageService taDrainageService;
+
+    @Autowired
+    private TaSalesBatchMapper taSalesBatchMapper;
+
     /**
      * 验证接入
      */
@@ -206,6 +217,7 @@ public class MiniAppController extends BaseController {
             miniResp.put("unionid", session.getUnionid());
             miniResp.put("name", miniapp.getName());
             miniResp.put("tpls", miniAppService.getTpls(appid));
+            miniResp.put("fddServerHost", miniapp.getFddServerHost());
 
             // 2020年3月30日 与曹建芳讨论 去掉此规则
 //            //如果是分享进来且没有进入过小程序，给分享人发放积分
@@ -239,19 +251,19 @@ public class MiniAppController extends BaseController {
             taPerson.setMiniappId(appid);
             taPersonService.updateById(taPerson);
 
-            // 增加积分线程
-            ExecutorService threadPool = Executors.newCachedThreadPool();
-            threadPool.execute(() -> {
-//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
-                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
-                    // 校验是否点击过此人的分享
-                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
-                    if (checkPoint) {
-                        // 添加积分
-                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
-                    }
-                }
-            });
+            // 增加积分线程 --- 3.5.23版本授权手机分享者增加积分，单纯分享不增加积分
+//            ExecutorService threadPool = Executors.newCachedThreadPool();
+//            threadPool.execute(() -> {
+////                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender) && count > 0) {
+//                if (null != from && from.contains("share") && !com.huiju.estateagents.common.StringUtils.isEmpty(recommender)) {
+//                    // 校验是否点击过此人的分享
+//                    boolean checkPoint = checkSharePersonFrom(from, taPerson.getPersonId(), targetId, orgId);
+//                    if (checkPoint) {
+//                        // 添加积分
+//                        applicationContext.publishEvent(new EventBus(recommender, EventBus.EventType.SharePosterAll, orgId));
+//                    }
+//                }
+//            });
 
             if (StringUtils.isNotBlank(from) && StringUtils.isNotBlank(recommender) && StringUtils.isNotBlank(targetId)) {
                 TaSharePersonFrom taSharePersonFrom = new TaSharePersonFrom();
@@ -294,6 +306,26 @@ public class MiniAppController extends BaseController {
                 } else if (from.contains("building")) {
                     taSharePersonFrom.setBuildingId(targetId);
                     sharePersonFromQueryWrapper.eq("building_id", targetId);
+                }else if (from.contains("help")) {
+                    HelpActivity helpActivity = helpActivityService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(helpActivity.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", helpActivity.getBuildingId());
+                }else if (from.contains("group")) {
+                    TaShareActivity taShareActivity = taShareActivityService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(taShareActivity.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taShareActivity.getBuildingId());
+                }else if (from.contains("live")) {
+                    TaLiveActivity liveActivity = taLiveActivityService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(liveActivity.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", liveActivity.getBuildingId());
+                }else if (from.contains("h5")) {
+                    TaDrainage taDrainage = taDrainageService.getById(targetId);
+                    taSharePersonFrom.setBuildingId(taDrainage.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taDrainage.getBuildingId());
+                }else if (from.contains("house")) {
+                    TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(targetId);
+                    taSharePersonFrom.setBuildingId(taSalesBatch.getBuildingId());
+                    sharePersonFromQueryWrapper.eq("building_id", taSalesBatch.getBuildingId());
                 }
                 Integer isFirstTime = taSharePersonFromService.count(sharePersonFromQueryWrapper);
                 if (isFirstTime > 0) {
@@ -462,72 +494,51 @@ public class MiniAppController extends BaseController {
             return ResponseBean.error("校验参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
+        // 手机号解码
         String sessionKey = params.getString("sessionKey");
         String encryptedData = params.getString("encryptedData");
         String iv = params.getString("iv");
+
+        // 楼盘ID
         String buildingId = params.getString("buildingId");
+        // 场景ID
+        String sceneId = params.getString("sceneId");
+        // 访问目标
+        String targetType = params.getString("targetType");
+        // 目标ID
+        String targetId = params.getString("targetId");
+        // 目标名称
+        String targetName = params.getString("targetName");
+        // 推广用户
+        String promoter = params.getString("promoter");
 
         // 解密
         WxMaPhoneNumberInfo phoneNoInfo = miniAppService.getPhoneNoInfo(sessionKey, encryptedData, iv, appid);
+        if (null == phoneNoInfo || com.huiju.estateagents.common.StringUtils.isEmpty(phoneNoInfo.getPhoneNumber())) {
+            ResponseBean.error("解析用户手机号码出错", ResponseBean.ERROR_UNAVAILABLE);
+        }
 
-        // 更新用户绑定手机
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
-        taPersonService.updatePersonPhone(openid, phoneNoInfo.getPhoneNumber(), buildingId, orgId);
-        List<TaPerson> taPersons = taPersonService.getPersonsByOpenId(openid);
-        if (null == taPersons || taPersons.size() != 1) {
-            return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-        }
-        TaPerson person = taPersons.get(0);
-        QueryWrapper<TaRecommendCustomer> cus = new QueryWrapper<>();
-        cus.eq("org_id", orgId);
-        cus.eq("phone", phoneNoInfo.getPhoneNumber());
-        cus.orderByDesc("create_date");
-        List<TaRecommendCustomer> customer = taRecommendCustomerService.list(cus);
-        if (customer.size() > 0) {
-            for (int i = 0; i < customer.size(); i++) {
-                customer.get(i).setPersonId(person.getPersonId());
-                customer.get(i).setPicture(person.getAvatarurl());
-                customer.get(i).setCountry(person.getCountry());
-                customer.get(i).setCity(person.getCity());
-                customer.get(i).setProvince(person.getProvince());
-            }
-//            TaRecommendCustomer customers = customer.get(0);
+        String phone = phoneNoInfo.getPhoneNumber();
 
-            if (!taRecommendCustomerService.updateBatchById(customer)) {
-                return ResponseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
-            }
-//            if(null != customers.getRecommendPerson()&&!StringUtils.isEmpty(customers.getRecommendPerson())&& StringUtils.isEmpty(person.getRecommendPerson())){
-//                person.setRecommendPerson(customers.getRecommendPerson());
-//                person.setRecommendPerson(customers.getRecommendPerson());
-//                TaPerson recommender = taPersonService.getById(customers.getRecommendPerson());
-//                if(null != recommender.getPersonType()&&!StringUtils.isEmpty(recommender.getPersonType())){
-//                    person.setRecommendPersonType(recommender.getPersonType());
-//                }
-//            }
-
-//            QueryWrapper<TaCustomerPerson> customerPersonQueryWrapper = new QueryWrapper<>();
-//            customerPersonQueryWrapper.eq("person_id",person.getPersonId());
-//            customerPersonQueryWrapper.eq("customer_id",customers.getCustomerId());
-//            List<TaCustomerPerson> list = taCustomerPersonService.list(customerPersonQueryWrapper);
-//            if(list.size()<=0){
-//                taCustomerPersonService.insertBean(person.getPersonId(),customers.getCustomerId());
-//            }
+        try {
+            taPersonService.authPhone(
+                    orgId,
+                    openid,
+                    phone,
+                    buildingId,
+                    sceneId,
+                    targetType,
+                    targetId,
+                    targetName,
+                    promoter);
+
+            return ResponseBean.success(phoneNoInfo);
+        } catch (Exception e) {
+//           e.printStackTrace();
+            return ResponseBean.error("授权手机失败: " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
         }
-//        else{
-//            TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
-//            taRecommendCustomer.setPersonId(person.getPersonId());
-//            taRecommendCustomer.setPicture(person.getAvatarurl());
-//            taRecommendCustomer.setCountry(person.getCountry());
-//            taRecommendCustomer.setCity(person.getCity());
-//            taRecommendCustomer.setProvince(person.getProvince());
-//            taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
-//            taRecommendCustomer.setOrgId(getOrgId(request));
-//            taRecommendCustomer.setEntryType(CommConstant.ENTRY_VOLUNTEER);
-//            taRecommendCustomer.setSex(Integer.getInteger(person.getGender()));
-//
-//        }
-        return ResponseBean.success(phoneNoInfo);
     }
 
     /**

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

@@ -1,14 +1,31 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+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.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 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;
 
 /**
  * 数据统计
@@ -52,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
@@ -151,6 +179,16 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectCityUser(orgId);
     }
 
+    /**
+     * 人员分布城市比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectCityPerson")
+    public ResponseBean selectCityPerson(HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        return iStatisticalService.selectCityPerson(orgId);
+    }
+
     /**
      * 意向用户  首页
      * @return
@@ -163,6 +201,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
@@ -184,4 +241,172 @@ public class StatisticalController extends BaseController {
                                          HttpServletRequest request) {
         return iStatisticalService.selectPersonFromGroupByDay(getOrgId(request), startDate,endDate);
     }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/barList")
+    public ResponseBean selectBuildingBar(@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.getStatsBarList(getOrgId(request), startDate, endDate, getTaPersonBuildingListByUserId(request));
+    }
+
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/tableList")
+    public ResponseBean selectBuildingTableList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @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 = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "sortField", required = false) String sortField,
+                                                @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                HttpServletRequest request) {
+        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/buildingExport")
+    public void getBuildingTableList(@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 = "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(), StatsBuilding.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目统计").build();
+        List<StatsBuilding> list = iStatisticalService.getExportTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/timeBarList")
+    public ResponseBean selectBuildingTimeBar(@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 = "buildingId", required = false) String buildingId,
+                                          HttpServletRequest request) {
+        return iStatisticalService.getStatsTimeBarList(getOrgId(request), startDate, endDate, buildingId, getTaPersonBuildingListByUserId(request));
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/timeTableList")
+    public ResponseBean selectBuildingTimeTableList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                @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 = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "sortField", required = false) String sortField,
+                                                @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                HttpServletRequest request) {
+        return iStatisticalService.getStatsTimeTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/buildingTimeExport")
+    public void getBuildingTimeTableList(@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 = "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(), StatsTimeBuilding.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目详情统计").build();
+        List<StatsTimeBuilding> list = iStatisticalService.getExportTimeTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        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/TaBuildingController.java

@@ -2,9 +2,9 @@ package com.huiju.estateagents.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaOrg;
@@ -14,24 +14,19 @@ import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
-import com.huiju.estateagents.service.ITdCityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
-import com.huiju.estateagents.base.BaseController;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -1,25 +1,18 @@
 package com.huiju.estateagents.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 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.entity.TaBuildingReport;
 import com.huiju.estateagents.service.ITaBuildingReportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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 com.huiju.estateagents.base.BaseController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
@@ -52,7 +45,7 @@ public class TaBuildingReportController extends BaseController {
      */
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="pageSize",defaultValue = "20") Integer pageSize,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

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

@@ -0,0 +1,149 @@
+package com.huiju.estateagents.controller;
+
+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 org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+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 com.huiju.estateagents.service.ITaCustomerFromService;
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+    * 客户来源  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@RestController
+@RequestMapping("/")
+public class TaCustomerFromController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaCustomerFromController.class);
+
+    @Autowired
+    public ITaCustomerFromService iTaCustomerFromService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFrom",method= RequestMethod.GET)
+    public ResponseBean taCustomerFromList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaCustomerFrom> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaCustomerFrom> result = iTaCustomerFromService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taCustomerFrom 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFrom",method= RequestMethod.POST)
+    public ResponseBean taCustomerFromAdd(@RequestBody TaCustomerFrom taCustomerFrom){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerFromService.save(taCustomerFrom)){
+                responseBean.addSuccess(taCustomerFrom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taCustomerFrom/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taCustomerFromDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaCustomerFromService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taCustomerFrom 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taCustomerFrom/{id}",method= RequestMethod.PUT)
+    public ResponseBean taCustomerFromUpdate(@PathVariable Integer id,
+                                        @RequestBody TaCustomerFrom taCustomerFrom){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaCustomerFromService.updateById(taCustomerFrom)){
+                responseBean.addSuccess(taCustomerFrom);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taCustomerFrom/{id}",method= RequestMethod.GET)
+    public ResponseBean taCustomerFromGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaCustomerFromService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taCustomerFromDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -62,7 +62,7 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -255,7 +255,7 @@ public class TaLiveActivityController extends BaseController {
             status = status == null ? 1 : status;
             Integer orgId = getOrgId(request);
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, status, null);
+                    liveActivityTitle, cityId, buildingId, status, null, null);
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

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

@@ -277,6 +277,7 @@ public class TaSalesBatchController extends BaseController {
             taPreselection.setStatus(taSalesBatch.getStatus());
             taPreselectionQueryWrapper.eq("org_id", getOrgId(request));
             taPreselectionQueryWrapper.eq("sales_batch_id", taSalesBatch.getSalesBatchId());
+            taPreselectionQueryWrapper.ne("status", CommConstant.STATUS_DELETE);
             taPreselectionService.update(taPreselection, taPreselectionQueryWrapper);
 
             QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();

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

@@ -222,6 +222,7 @@ public class TaSharePersonFromController extends BaseController {
         try {
             QueryWrapper<TdLiveDict> tdLiveDictQueryWrapper = new QueryWrapper<>();
             tdLiveDictQueryWrapper.eq("status", 1);
+            tdLiveDictQueryWrapper.orderByDesc("sort");
             List<TdLiveDict> tdLiveDictList = tdLiveDictService.list(tdLiveDictQueryWrapper);
             responseBean.addSuccess(tdLiveDictList);
         }catch (Exception e){

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

@@ -1,10 +1,8 @@
 package com.huiju.estateagents.controller;
 
 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.CommConstant;
 import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaOrgCity;
 import com.huiju.estateagents.entity.TdCity;
@@ -14,14 +12,7 @@ import com.huiju.estateagents.service.ITdCityService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-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 com.huiju.estateagents.base.BaseController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -78,6 +69,18 @@ public class TdCityController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 业务端城市
+     */
+    @RequestMapping(value = "/admin/tdCityList/tdAreaCity", method = RequestMethod.GET)
+    public ResponseBean adminTdAreaCityList(@RequestParam(value = "cityId", required = false) Integer cityId,
+                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean<>();
+        List<TaOrgCity> taOrgCityList = taOrgCityMapper.selectAdminTdAreaCityList(getOrgId(request),cityId);
+        responseBean.addSuccess(taOrgCityList);
+        return responseBean;
+    }
+
 
     /**
      * 查询列表

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

@@ -118,6 +118,7 @@ public class TdPointsRulesController extends BaseController {
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             Integer orgId = getOrgId(request);
             queryWrapper.eq(orgId != null,"org_id",orgId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             if(null != type){
                 if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
                     queryWrapper.isNull("building_id");

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

@@ -0,0 +1,105 @@
+package com.huiju.estateagents.controller;
+
+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.ExcelUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+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.ITsActivityDailyService;
+import com.huiju.estateagents.entity.TsActivityDaily;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * <p>
+    * 活动统计  前端控制器
+    * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@RestController
+@RequestMapping("/api/admin/stats")
+public class TsActivityDailyController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TsActivityDailyController.class);
+
+    @Autowired
+    public ITsActivityDailyService iTsActivityDailyService;
+
+    @GetMapping("/activity/detail")
+    public ResponseBean getActivityDetail(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                          @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                          // startDate 默认格式 YYYY-MM-DD
+                                          @RequestParam(value ="startDate", required = false) String startDate,
+                                          @RequestParam(value ="endDate", required = false) String endDate,
+                                          @RequestParam(value ="buildingId", required = false) String buildingId,
+                                          @RequestParam(value ="targetType", required = false) String targetType,
+                                          @RequestParam(value ="targetId", required = false) String targetId,
+                                          @RequestParam(value ="targetName", required = false) String targetName,
+                                          @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);
+
+//        IPage<TsActivityDaily> page = new Page<>(pageNum, pageSize);
+//        IPage<TsActivityDaily> result = iTsActivityDailyService.getActivityDetail(page, orgId, startDate, endDate, buildingId, targetType, targetId, targetName, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+        List<TsActivityDaily>  result = iTsActivityDailyService.getActivityDetail(orgId, startDate, endDate, buildingId, targetType, targetId, targetName, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+
+        return ResponseBean.success(result);
+    }
+
+    @PostMapping("/activity/detail")
+    public ResponseBean getActivityDetail(// startDate 默认格式 YYYY-MM-DD
+                                          @RequestParam(value ="startDate", required = false) String startDate,
+                                          @RequestParam(value ="endDate", required = false) String endDate,
+                                          @RequestParam(value ="buildingId", required = false) String buildingId,
+                                          @RequestParam(value ="targetType", required = false) String targetType,
+                                          @RequestParam(value ="targetId", required = false) String targetId,
+                                          @RequestParam(value ="targetName", required = false) String targetName,
+                                          HttpServletRequest request,
+                                          HttpServletResponse response) {
+
+        if (null == startDate || "".equals(startDate)) {
+            return ResponseBean.error("开始日期不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+        if (null == endDate || "".equals(endDate)) {
+            endDate = DateUtils.today();
+        }
+        if (null == targetType || "".equals(targetType) || null == targetId || "".equals(targetId)) {
+            return ResponseBean.error("活动类型或者ID 不能为空", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
+
+        Integer orgId = getOrgId(request);
+        List<ActivityDailyExport> result = iTsActivityDailyService.getActivityExport(orgId, startDate, endDate, buildingId, targetType, targetId);
+
+        try {
+            ExcelUtils.flush(response, ActivityDailyExport.class, result, StringUtils.strToUnicode(targetName + "活动统计"));
+        } catch (IOException e) {
+//            e.printStackTrace();
+            return ResponseBean.error("导出Excel出错, 请重试 : " + e.getMessage(), ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        return null;
+    }
+
+}

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

@@ -0,0 +1,470 @@
+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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.ExcelUtils;
+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 io.swagger.models.auth.In;
+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);
+        Integer userId = getUserId(request);
+        try {
+            // 汇总明细
+            IPage<TsConsultantKpi> result = iTsConsultantKpiService.stsKPIDaily(pageNum, pageSize, orgId, userId, buildingId, startDate, endDate, StringUtils.humpToLine(asc), StringUtils.humpToLine(desc));
+            // 汇总
+            TsConsultantKpi total = iTsConsultantKpiService.stsKPITotalByOrg(orgId, userId, buildingId, startDate, endDate);
+            return ResponseBean.success(new HashMap<String, Object>() {{
+                put("paged", result);
+                put("total", total);
+            }});
+        } catch (Exception e) {
+            logger.error("stsConsultantKpiList 异常：", e);
+            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);
+        Integer userId = getUserId(request);
+        try {
+
+            // 汇总明细
+            List<ConsultantKPIExport> result = iTsConsultantKpiService.stsKPIDailyExport(orgId, userId, buildingId, startDate, endDate);
+            ExcelUtils.flush(response, ConsultantKPIExport.class, result, "置业顾问KPI统计" + DateUtils.today());
+        } catch (Exception e) {
+//            e.printStackTrace();
+            return ResponseBean.error("导出Excel出错, 请重试 : " + 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.dayToLocalDateime(endDate.substring(0, 4) + "-" + endDate.substring(4, 6) + "-" + endDate.substring(6, 8) + " 23:59:59");
+        }
+
+        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<>();
@@ -296,6 +290,9 @@ public class TaDrainageController extends BaseController {
             queryWrapper.eq("org_id",taDrainage.getOrgId());
             queryWrapper.eq("content_type",CommConstant.EVENT_H5);
             queryWrapper.eq("target_id",taDrainage.getDrainageId());
+
+            queryWrapper.gt("status", CommConstant.STATUS_DELETE); // fix bug #6816
+
             List<ExtendContent> list = iExtendContentService.list(queryWrapper);
             if (null != taDrainage.getStatus() && taDrainage.getStatus().equals(CommConstant.STATUS_NORMAL)){
                 taDrainage.setStatus(CommConstant.STATUS_UNACCALIMED);

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/eContract/controller/TaCompanyController.java

@@ -462,6 +462,8 @@ public class TaCompanyController extends BaseController {
             taContractUserQueryWrapper.eq("certified_serial_number",serialNo);
             TaContractUser taContractUser = iTaContractUserService.getOne(taContractUserQueryWrapper);
             taContractUser.setStatus(Integer.valueOf(status));
+            taContractUser.setAuthStatus("autoSign");
+            iTaContractUserService.updateById(taContractUser);
 //            //如果状态是失败的情况下就发送短信  先注释如果没问题就删除
 //            if (status.equals("1")){
 //                logger.info("发送短信");
@@ -485,8 +487,8 @@ public class TaCompanyController extends BaseController {
 //                }
 //
 //            }
-            taContractUser.setAuthStatus("autoSign");
-            iTaContractUserService.updateById(taContractUser);
+
+
         }
     }
 
@@ -589,8 +591,8 @@ public class TaCompanyController extends BaseController {
         Map<String, String[]> parameterMap = request.getParameterMap();
         if ("3000".equals(result_code)){
             TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
-            taContract.setContractDownloadUrl(download_url);
-            taContract.setContractViewUrl(viewpdf_url);
+//            taContract.setContractDownloadUrl(download_url);
+//            taContract.setContractViewUrl(viewpdf_url);
             taContract.setStatus(CommConstant.STATUS_NORMAL);
             taContract.setCustomerTime(LocalDateTime.now());
             taContract.setReason(parameterMap.get("result_desc")[0]);
@@ -604,8 +606,8 @@ public class TaCompanyController extends BaseController {
             iTaContractService.updateById(taContract);
         }else{
             TaContract taContract = iTaContractService.getById(parameterMap.get("contract_id")[0]);
-            taContract.setContractDownloadUrl(download_url);
-            taContract.setContractViewUrl(viewpdf_url);
+//            taContract.setContractDownloadUrl(download_url);
+//            taContract.setContractViewUrl(viewpdf_url);
             //签署失败
             taContract.setStatus(2);
             taContract.setReason(parameterMap.get("result_desc")[0]);

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractServiceImpl.java

@@ -123,8 +123,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         queryWrapper.eq("person_id",person.getPersonId());
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
         if (null != oldContract){
-            oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
-            oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
+            oldContract.setContractDownloadUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
+            oldContract.setContractViewUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
             return oldContract;
         }
 
@@ -163,15 +163,15 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         req.setSign_keyword(taContractBusiness.getSignatoryKeywords());
         req.setKeyword_strategy(taContractBusiness.getSignatoryStrategy());
         req.setDoc_title(taContractBusiness.getContractTemplateName());
-        String autoSignResult = base.invokeExtSignAuto(req);
+        String autoSignResult = base.invokeExtSignAuto(req,taContractBusiness.getSignatureId());
         JSONObject autoSignResultJson = JSONObject.parseObject(autoSignResult);
         if (!autoSignResultJson.getString("code").equals("1000")){
             throw new Exception(jsonObject.getString("msg"));
         }
 
         //反更新合同地址
-        taContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
-        taContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
+        taContract.setContractDownloadUrl(getFddServerHost(person.getMiniappId(),autoSignResultJson.getString("download_url")));
+        taContract.setContractViewUrl(getFddServerHost(person.getMiniappId(),autoSignResultJson.getString("viewpdf_url")));
         taContract.setContractName(taContractBusiness.getContractTemplateName());
         //合同详情
         taContract.setCompanyName(taContractBusiness.getCompanyName());
@@ -267,7 +267,22 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         }
 
         taContractMapper.updateById(taContract);
-        return signUrl;
+        String manualUrl = getFddServerHost(person.getMiniappId(), signUrl);
+        return manualUrl;
+    }
+
+
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddServerHost(String miniappId,String subUrl) {
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddServerHost()) ? subUrl : taMiniapp.getFddServerHost() + subUrl.substring(threeIndex);
+        return newUrl;
     }
 
     /**
@@ -298,8 +313,8 @@ public class TaContractServiceImpl extends ServiceImpl<TaContractMapper, TaContr
         queryWrapper.eq("company_id",taContractBusiness.getCompanyId());
         queryWrapper.eq("person_id",person.getPersonId());
         TaContract oldContract = taContractMapper.selectOne(queryWrapper);
-        oldContract.setContractDownloadUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
-        oldContract.setContractViewUrl(getFddDownServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
+        oldContract.setContractDownloadUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractDownloadUrl()));
+        oldContract.setContractViewUrl(getFddServerHost(person.getMiniappId(),oldContract.getContractViewUrl()));
         return oldContract;
     }
 }

src/main/java/com/huiju/estateagents/eContract/service/impl/TaContractUserServiceImpl.java

@@ -62,9 +62,10 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         queryWrapper.eq("mini_openid",MD5Utils.md5(person.getMiniOpenid()));
         TaContractUser taContractUser = taContractUserMapper.selectOne(queryWrapper);
         if (null != taContractUser) {
-            taContractUser.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
-            taContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
-            return taContractUser;
+            TaContractUser firstCustomerInfo = getFirstCustomerInfo(person);
+            firstCustomerInfo.setRaiseRecordId(taRaiseRecord.getRaiseRecordId());
+            firstCustomerInfo.setCertifiedAddress(getFddDownServerHost(person.getMiniappId(),taContractUser.getCertifiedAddress()));
+            return firstCustomerInfo;
         }
         //没有法大大账号的先注册
         log.info("========法大大个人注册=======");
@@ -90,7 +91,8 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         newContractUser.setOrgId(person.getOrgId());
 
         log.info("正在申请个人认证,客户编码是{}",jsonObject.getString("data"));
-        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),fadadaProperties.getServeHost());
+        log.info("appid {} , secret {}, version {} , serverhost {}",fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
+        GetPersonVerifyUrl personverify = new GetPersonVerifyUrl(fadadaProperties.getAppId(),fadadaProperties.getAppSecret(),fadadaProperties.getVersion(),getFddServerHost(person.getMiniappId(),fadadaProperties.getServeHost()));
         String customer_id = jsonObject.getString("data");
         //0:三要素标准方案； 1:三要素补充方案 4 纯三要素方案；
         String verifyed_way = "4";
@@ -107,7 +109,7 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         if (null !=data){
             String url = JSON.parseObject(data).getString("url");
             url = decode(url);
-            newContractUser.setCertifiedAddress(getFddServerHost(person.getMiniappId(),url));
+            newContractUser.setCertifiedAddress(getFddDownServerHost(person.getMiniappId(),url));
             newContractUser.setCertifiedSerialNumber(JSON.parseObject(data).getString("transactionNo"));
         }
         newContractUser.setStatus(0);
@@ -130,6 +132,22 @@ public class TaContractUserServiceImpl extends ServiceImpl<TaContractUserMapper,
         return newUrl;
     }
 
+    /**
+     * 替换法大大服务器地址
+     * @return
+     */
+    private String getFddDownServerHost(String miniappId,String subUrl) {
+        if (StringUtils.isEmpty(subUrl)){
+            return subUrl;
+        }
+        TaMiniapp taMiniapp = taMiniappMapper.selectById(miniappId);
+        int index = subUrl.indexOf("/");
+        int twoIndex = subUrl.indexOf("/",index+1);
+        int threeIndex = subUrl.indexOf("/",twoIndex+1);
+        String newUrl = StringUtils.isEmpty(taMiniapp.getFddDownloadHost()) ? subUrl : taMiniapp.getFddDownloadHost() + subUrl.substring(threeIndex);
+        return newUrl;
+    }
+
     /**
      * 去法大大处更新客户的状态
      *

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/TaCustomerFrom.java

@@ -0,0 +1,113 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 客户来源 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaCustomerFrom implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 用户ID
+     */
+    private String personId;
+
+    /**
+     * 客户ID
+     */
+    private String customerId;
+
+    /**
+     * 用户名
+     */
+    private String personName;
+
+    /**
+     * 目标类型
+     */
+    private String targetType;
+
+    /**
+     * 目标ID
+     */
+    private String targetId;
+
+    /**
+     * 目标名称
+     */
+    private String targetName;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 分享人ID
+     */
+    private String sharePersonId;
+
+    /**
+     * 分享人名称
+     */
+    private String sharePersonName;
+
+    /**
+     * 场景ID
+     */
+    private String sceneId;
+
+    /**
+     * 首次进入小程序
+     */
+    private Boolean isOrgFirst;
+
+    /**
+     * 首次进入项目
+     */
+    private Boolean isProjectFirst;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+
+}

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

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

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

@@ -1,16 +1,13 @@
 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
-import java.util.List;
 
 /**
  * <p>
@@ -78,6 +75,11 @@ public class TaPersonPositon implements Serializable {
      */
     private String address;
 
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
 
     /**
      * 创建时间

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

@@ -1,10 +1,5 @@
 package com.huiju.estateagents.entity;
 
-import java.time.LocalDateTime;
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.format.DateTimeFormat;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -16,6 +11,11 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 推荐客户表
@@ -199,9 +199,27 @@ public class TaRecommendCustomer implements Serializable {
     @TableField(exist = false)
     private String avatarurl;
 
+    /**
+     * 所属项目
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
     /**
      * 来源类型
      */
     @TableField(exist = false)
     private String personFrom;
+
+    /**
+     * 迁移人的名称
+     */
+    @TableField(exist = false)
+    private String moveUserName;
+
+    /**
+     * 迁移人的userId
+     */
+    @TableField(exist = false)
+    private String moveUserId;
 }

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/TsActivityDaily.java

@@ -0,0 +1,97 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 活动统计 
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TsActivityDaily implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 序号
+     */
+    @TableId(value = "serial_no", type = IdType.AUTO)
+    private Integer serialNo;
+
+    /**
+     * 统计时间
+     */
+    private String statisDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 活动类型
+     */
+    private String targetType;
+
+    /**
+     * 活动ID
+     */
+    private String targetId;
+
+    /**
+     * 活动名称
+     */
+    private String targetName;
+
+    /**
+     * 分享次数
+     */
+    private Integer shareNum;
+
+    /**
+     * 分享人数
+     */
+    private Integer sharePersons;
+
+    /**
+     * 访问次数
+     */
+    private Integer visitNum;
+
+    /**
+     * 访问人数
+     */
+    private Integer visitPersons;
+
+    /**
+     * 新增用户
+     */
+    private Integer newPersons;
+
+    /**
+     * 新增客户
+     */
+    private Integer newCustomers;
+
+
+}

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/ActivityDailyExport.java

@@ -0,0 +1,48 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+@Data
+public class ActivityDailyExport {
+
+    /**
+     * 统计时间
+     */
+    @ExcelProperty(value = "日期", index = 1)
+    private String statisDate;
+
+
+    @ExcelProperty(value = "分享标题", index = 0)
+    private String targetName;
+
+    /**
+     * 分享次数
+     */
+    @ExcelProperty(value = "分享次数", index = 3)
+    private Integer shareNum;
+
+    /**
+     * 分享人数
+     */
+    @ExcelProperty(value = "分享人数", index = 2)
+    private Integer sharePersons;
+
+    /**
+     * 访问次数
+     */
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer visitNum;
+
+    /**
+     * 访问人数
+     */
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer visitPersons;
+
+    /**
+     * 新增客户
+     */
+    @ExcelProperty(value = "新增注册用户", index = 6)
+    private Integer newCustomers;
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ActivityDetailShareRecord.java

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class ActivityDetailShareRecord {
+
+    @ExcelIgnore
+    private String activityId;
+
+    /**
+     * 活动类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动类型", index = 0)
+    private String activityType;
+
+    /**
+     * 活动名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "活动名称", index = 1)
+    private String activityName;
+
+    /**
+     * 分享人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享人数", index = 2)
+    private Integer sharePersonNum;
+
+    /**
+     * 分享次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享次数", index = 3)
+    private Integer shareNum;
+
+    /**
+     * 新增注册用户数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增注册用户数", index = 4)
+    private Integer addRegistNum;
+
+    /**
+     * 访问人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 5)
+    private Integer visitPersonNum;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 6)
+    private Integer visitNum;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/AddRegistNum.java

@@ -0,0 +1,73 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class AddRegistNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 来源渠道
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来源渠道", index = 4)
+    private String personFrom;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+    /**
+     * 分享者
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者", index = 7)
+    private String sharePersonName;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者电话", index = 8)
+    private String sharePersonPhone;
+
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/ShareNum.java

@@ -0,0 +1,49 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class ShareNum {
+    /**
+     * 分享者姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者姓名", index = 0)
+    private String sharePersonName;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者电话", index = 1)
+    private String sharePersonPhone;
+
+    /**
+     * 分享者类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者类型", index = 2)
+    private String sharePersonType;
+
+    /**
+     * 分享时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享时间", index = 3)
+    private String shareTime;
+
+//    /**
+//     * 访问人数
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "访问人数", index = 4)
+//    private Integer visitPersonNum;
+
+    @ExcelIgnore
+    private String sharePersonId;
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/SharePersonNum.java

@@ -0,0 +1,54 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class SharePersonNum {
+    /**
+     * 分享者姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者姓名", index = 0)
+    private String sharePersonName;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者电话", index = 1)
+    private String sharePersonPhone;
+
+    /**
+     * 分享者类型
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者类型", index = 2)
+    private String sharePersonType;
+
+    /**
+     * 分享次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享次数", index = 3)
+    private Integer shareNum;
+
+    /**
+     * 访问人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer visitPersonNum;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer visitNum;
+
+    @ExcelIgnore
+    private String personId;
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/StatisicAttractUser.java

@@ -0,0 +1,51 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class StatisicAttractUser {
+    /**
+     * 日期
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "日期", index = 0)
+    private String date;
+
+    /**
+     * 分享人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增客户", index = 1)
+    private Integer sharePersonNum;
+
+    /**
+     * 分享次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享次数", index = 2)
+    private Integer shareNum;
+
+    /**
+     * 访问人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 3)
+    private Integer visitPersonNum;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 4)
+    private Integer visitNum;
+
+    /**
+     * 新增注册用户数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增注册用户数", index = 5)
+    private Integer addRegistNum;
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/VisitNum.java

@@ -0,0 +1,79 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class VisitNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 来源渠道
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来源渠道", index = 4)
+    private String personFrom;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+    /**
+     * 分享者
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者", index = 7)
+    private String sharePersonName;
+
+    /**
+     * 分享者电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "分享者电话", index = 8)
+    private String sharePersonPhone;
+
+    /**
+     * 访问时间
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问时间", index = 9)
+    private String visitDate;
+
+}

src/main/java/com/huiju/estateagents/excel/ActivityStatistics/VisitPersonNum.java

@@ -0,0 +1,86 @@
+package com.huiju.estateagents.excel.ActivityStatistics;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class VisitPersonNum {
+    /**
+     * 姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "姓名", index = 0)
+    private String nickName;
+
+    /**
+     * 电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "电话", index = 1)
+    private String phone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 2)
+    private String gender;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 3)
+    private String province;
+
+    /**
+     * 来源渠道
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "来源渠道", index = 4)
+    private String personFrom;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+    /**
+     * 推广人
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人", index = 7)
+    private String sharePersonName;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
+
+    /**
+     * 访问次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 8)
+    private String visitNum;
+
+
+}

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,94 @@
+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;
+
+    /**
+     * 归属地
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "归属地", index = 4)
+    private String province;
+
+    /**
+     * 置业顾问
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问", index = 5)
+    private String realtyConsultant;
+
+    /**
+     * 置业顾问电话
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "置业顾问电话", index = 6)
+    private String realtyConsultantPhone;
+
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
+
+    /**
+     * 性别
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "性别", index = 7)
+    private String gender;
+
+    /**
+     * 来源
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户来源", index = 8)
+    private String personFrom;
+
+    /**
+     * 推广人
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人", index = 9)
+    private String recommendPerson;
+
+}

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

@@ -86,4 +86,18 @@ public class PrivateCustomerExport {
     @ColumnWidth(15)
     @ExcelProperty(value = "意向度（意向值）", index = 8)
     private String intention ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人员", index = 10)
+    private String sharePersonName ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "积分值", index = 11)
+    private String points ;
 }

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

@@ -28,7 +28,7 @@ public class PublicCustomerExport {
      * 性别
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "性别", index = 7)
+    @ExcelProperty(value = "性别", index = 8)
     private String sex;
 
     /**
@@ -42,7 +42,7 @@ public class PublicCustomerExport {
      * 归属地
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "归属地", index = 4)
+    @ExcelProperty(value = "归属地", index = 5)
     private String province;
 
 //    /**
@@ -56,20 +56,41 @@ public class PublicCustomerExport {
      * 来访方式
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "来访方式（场景渠道）", index = 5)
+    @ExcelProperty(value = "来访方式（场景渠道）", index = 6)
     private String sceneType;
 
     /**
      * 意向度
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "意向度（意向值）", index = 6)
+    @ExcelProperty(value = "意向度（意向值）", index = 7)
     private String intention;
 
     /**
      * 项目名称
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "项目名称", index = 3)
+    @ExcelProperty(value = "项目名称", index = 4)
     private String buildingName;
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "是否归属项目", index = 3)
+    private String belongStatus;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人员", index = 9)
+    private String sharePersonName ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "积分值", index = 10)
+    private String points ;
 }

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

@@ -0,0 +1,61 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class StatsBuilding {
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 0)
+    private String buildingName;
+
+    /**
+     * 新增客户 公客加私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增客户", index = 1)
+    private Integer khNum;
+
+    /**
+     * 公客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公客", index = 2)
+    private Integer gkNum;
+
+    /**
+     * 私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "私客", index = 3)
+    private Integer skNum;
+
+    /**
+     * 观看人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer uvNum;
+
+    /**
+     * 观看次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer pvNum;
+
+
+    @ExcelIgnore
+    private String buildingId;
+
+
+
+
+
+}

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

@@ -0,0 +1,59 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class StatsTimeBuilding {
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 0)
+    private String buildingName;
+
+    /**
+     * 日期
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "日期", index = 1)
+    private String createDate;
+
+    /**
+     * 新增客户 公客加私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增客户", index = 2)
+    private Integer khNum;
+
+    /**
+     * 公客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公客", index = 3)
+    private Integer gkNum;
+
+    /**
+     * 私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "私客", index = 4)
+    private Integer skNum;
+
+    /**
+     * 观看人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 5)
+    private Integer uvNum;
+
+    @ExcelIgnore
+    private String buildingId;
+
+
+
+
+}

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

@@ -0,0 +1,25 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.bo.request.ActivityStatisticResponseBO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.springframework.stereotype.Component;
+
+/**
+ * @author gusy
+ * @date 2020/4/26 11:16
+ */
+@Component
+@Mapper
+public interface ActivityManageMapper {
+
+    /**
+     * 获取活动统计数据
+     *
+     * @return
+     */
+    ActivityStatisticResponseBO getStatisticDataByType(@Param("type") String type,
+                                                       @Param("id") String id,
+                                                       @Param("orgId") Integer orgId);
+
+}

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.bo.request.ActivityStatisticResponseBO;
 import com.huiju.estateagents.entity.TaBuildingDynamic;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;

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

@@ -1,13 +1,16 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaBuilding;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -93,4 +96,89 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
     int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
 
     List<TaBuilding> selectMainBuildings(@Param("cityId") String cityId, @Param("orgId") Integer orgId);
+
+    /**
+     * 获取公客统计图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getGkBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取私客统计图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getSkBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 项目访问人数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getWgBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 项目访问次数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getFwBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取项目统计列表数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType);
+
+    /**
+     * 获取导出的数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    List<StatsBuilding> getExportTableList(@Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取单独building的折线图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    List<StatsTimeBuilding> getStatsTimeBarList(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId, @Param("buildingName") String buildingName);
+
+    /**
+     * 获取详情数据表格
+     * @param pg
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param sortField
+     * @param orderType
+     * @return
+     */
+    IPage<StatsTimeBuilding> getStatsTimeTableList(IPage<StatsTimeBuilding> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId,@Param("sortField") String sortField,@Param("orderType") String orderType);
 }

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

@@ -0,0 +1,22 @@
+package com.huiju.estateagents.mapper;
+
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 客户来源  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@Mapper
+public interface TaCustomerFromMapper extends BaseMapper<TaCustomerFrom> {
+
+    Map<String, Number> countPerson(@Param("orgId") Integer orgId, @Param("buildingId") String buildingId, @Param("personId") String personId);
+}

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

@@ -30,7 +30,7 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("userId") Integer userId);
     /**
      * 批量更新直播活动状态
      *

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

@@ -27,4 +27,12 @@ public interface TaOrgCityMapper extends BaseMapper<TaOrgCity> {
      * @return
      */
     List<TaOrgCity> selectAdminTdCityList(Integer orgId);
+
+    /**
+     * 查询市下的区信息
+     * @param orgId
+     * @param cityId
+     * @return
+     */
+    List<TaOrgCity> selectAdminTdAreaCityList(Integer orgId, Integer cityId);
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPointsExchange;
@@ -23,4 +24,6 @@ public interface TaPersonBuildingMapper extends BaseMapper<TaPersonBuilding> {
     List<TaPersonBuilding> selectListByParams(Page page, @Param("orgId")Integer orgId, @Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("personBuildingList")List<TaPersonBuilding> taPersonBuildingList);
 
     List<SalesExport> selectSalesList(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId, @Param("startCreateDate")  String startCreateDate,@Param("endCreateDate") String endCreateDate, @Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingList);
+
+    List<TaBuilding> getBuildingsOf(@Param("personOrUser") String personOrUser);
 }

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,13 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer savePersonPosition(TaPersonPositon record);
+
+    /**
+     * 今日新增人数
+     * @param orgId
+     * @return
+     */
+    Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
+
+    List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
 }

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

@@ -86,4 +86,6 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
     List<TaPersonVisitRecord> selectData();
 
     List<TaPersonVisitRecord> selectTapersonFromShare();
+
+    Integer selectTodayVisitCount(@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime now);
 }

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

@@ -33,7 +33,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
 
     TaRecommendCustomer getCustomerById(@Param("customerId")String customerId);
 
-    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+    IPage<TaRecommendCustomer> getCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId,@Param("status")Integer status, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sceneType") String sceneType, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate, @Param("sharePersonName") String sharePersonName);
     IPage<TaRecommendCustomer> getRecCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaRecommendCustomer> getRepCustomerList(IPage<TaRecommendCustomer> page,@Param("building") String building, @Param("name") String name, @Param("tel") String tel, @Param("consultName") String consultName, @Param("consultTel") String consultTel,@Param("entryType") String entryType,@Param("verifyStatus") String verifyStatus,@Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     IPage<TaPerson> getIndependentAgents(IPage<TaPerson>page, @Param("name") String name, @Param("tel") String tel, @Param("orgId") Integer orgId);
@@ -49,7 +49,21 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param personBuildingList
      * @return
      */
-    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel") String consultTel, @Param("sceneType") String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("buildingId") String buildingId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+    IPage<TaPerson> getPublicCustomerList(IPage<TaPerson> page,
+                                          @Param("name") String name,
+                                          @Param("tel") String tel,
+                                          @Param("entryType") String entryType,
+                                          @Param("verifyStatus") String verifyStatus,
+                                          @Param("sex") Integer sex,
+                                          @Param("orgId") Integer orgId,
+                                          @Param("consultTel") String consultTel,
+                                          @Param("sceneType") String sceneType,
+                                          @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                          @Param("buildingId") String buildingId,
+                                          @Param("startCreateDate") String startCreateDate,
+                                          @Param("endCreateDate") String endCreateDate,
+                                          @Param("sharePersonName") String sharePersonName,
+                                          @Param("belongStatus") Integer belongStatus);
 
     /**
      * 导出数据 获取推荐用户数据
@@ -119,7 +133,19 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel, @Param("sceneType")String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode,
+                                                           @Param("pageSize") Integer pageSize,
+                                                           @Param("buildingId")String buildingId,
+                                                           @Param("name") String name,
+                                                           @Param("tel") String tel,
+                                                           @Param("entryType") String entryType,
+                                                           @Param("verifyStatus") String verifyStatus,
+                                                           @Param("sex") Integer sex,
+                                                           @Param("orgId") Integer orgId,
+                                                           @Param("consultTel")String consultTel,
+                                                           @Param("sceneType")String sceneType,
+                                                           @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,
+                                                           @Param("belongStatus") Integer belongStatus);
 
     /**
      * 导出数据 私客总数
@@ -191,4 +217,22 @@ 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,
+                                                           @Param("personId") String personId);
+
+    /**
+     * 获取置业福问下的客户
+     * @param userId
+     * @param personId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    List<TaRecommendCustomer> getConsultantCustomerList(@Param("userId") Integer userId,@Param("personId") String personId,@Param("buildingId") String buildingId,@Param("orgId") Integer orgId);
 }

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

@@ -23,5 +23,5 @@ public interface TaShareMapper extends BaseMapper<TaShare> {
 
     List<TaShare> listLiveShare(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("shareType")String shareType, @Param("phone")String phone, @Param("liveActivityId")Integer liveActivityId);
 
-    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top);
+    List<Map<String, Object>> statTopShare(@Param("orgId") Integer orgId, @Param("targetType") String targetType, @Param("targetId") String targetId, @Param("top") Integer top,@Param("beginDate") String beginDate, @Param("endDate") String endDate);
 }

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

@@ -44,4 +44,16 @@ public interface TaSharePersonFromMapper extends BaseMapper<TaSharePersonFrom> {
      */
     List<TaSharePersonFrom> selectLiveActivityVisitList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("sceneType")String sceneType, @Param("phone")String phone, @Param("liveActivityId")String liveActivityId);
 
+    /**
+     * 获取置业的最近一条分享记录
+     * @param orgId
+     * @param buildingId
+     * @param userId
+     * @param personId
+     * @return
+     */
+    TaSharePersonFrom getConsultantLastShare(@Param("orgId") Integer orgId,
+                                             @Param("buildingId") String buildingId,
+                                             @Param("userId") Integer userId,
+                                             @Param("personId") String personId);
 }

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

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 活动统计  Mapper 接口
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@Mapper
+public interface TsActivityDailyMapper extends BaseMapper<TsActivityDaily> {
+
+    /**
+     * 按天汇总活动统计信息
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param targetType
+     * @param targetId
+     * @param targetName
+     * @param asc
+     * @param desc
+     * @return
+     */
+    List<TsActivityDaily> getActivityDetail(@Param("orgId") Integer orgId,
+                                             @Param("startDate") String startDate,
+                                             @Param("endDate") String endDate,
+                                             @Param("buildingId") String buildingId,
+                                             @Param("targetType") String targetType,
+                                             @Param("targetId") String targetId,
+                                             @Param("targetName") String targetName,
+                                             @Param("asc") String asc,
+                                             @Param("desc") String desc);
+
+    /**
+     * 活动统计详情导出
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param targetType
+     * @param targetIdd
+     * @return
+     */
+    List<ActivityDailyExport> getActivityExport(@Param("orgId") Integer orgId,
+                                                @Param("startDate") String startDate,
+                                                @Param("endDate") String endDate,
+                                                @Param("buildingId") String buildingId,
+                                                @Param("targetType") String targetType,
+                                                @Param("targetId") String targetIdd);
+
+
+}

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

@@ -0,0 +1,216 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPerson;
+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> {
+
+    /**
+     * 置业KPI 汇总
+     * @param page
+     * @param orgId
+     * @param buildingIds
+     * @param startDate
+     * @param endDate
+     * @param asc
+     * @param desc
+     * @return
+     */
+    IPage<TsConsultantKpi> stsKPIDaily(IPage<TsConsultantKpi> page,
+                                       @Param("orgId") Integer orgId,
+                                       @Param("buildingIds") List<String> buildingIds,
+                                       @Param("startDate") String startDate,
+                                       @Param("endDate") String endDate,
+                                       @Param("asc") String asc,
+                                       @Param("desc") String desc);
+
+    TsConsultantKpi stsKPITotalByOrg(@Param("orgId") Integer orgId,
+                                     @Param("buildingIds") List<String> buildingIds,
+                                     @Param("startDate") String startDate,
+                                     @Param("endDate") String endDate);
+
+    List<ConsultantKPIExport> stsKPIDailyExport(@Param("orgId") Integer orgId,
+                                                @Param("buildingIds") List<String> buildingIds,
+                                                @Param("startDate") String startDate,
+                                                @Param("endDate") String endDate);
+
+    /**
+     * 统计当前时间段内的, 已经固化的置业数据的所有客户
+     * @param orgId
+     * @param buildingIds
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    Integer stsAllCustomersByOrg(@Param("orgId") Integer orgId,
+                                 @Param("buildingIds") List<String> buildingIds,
+                                 @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/IActivityManageService.java

@@ -0,0 +1,27 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.bo.request.ActivityStatisticResponseBO;
+import com.huiju.estateagents.mapper.ActivityManageMapper;
+import com.huiju.estateagents.service.impl.ActivityManageServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author gusy
+ * @date 2020/4/26 11:14
+ */
+@Service
+public class IActivityManageService implements ActivityManageServiceImpl {
+
+    @Autowired
+    private ActivityManageMapper activityManageMapper;
+
+    @Override
+    public ResponseBean getStatisticDataByType(String type, String id,Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        ActivityStatisticResponseBO responseBO = activityManageMapper.getStatisticDataByType(type, id,orgId);
+        responseBean.addSuccess(responseBO);
+        return responseBean;
+    }
+}

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

@@ -2,9 +2,11 @@ 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;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -126,4 +128,98 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 获取楼盘的折线图统计
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsBarList(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 获取楼盘统计所有数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder);
+
+    /**
+     * 获取需要导出的数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 按时间获取此楼盘的数据折线图
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsTimeBarList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 分页统计楼盘详情数据
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @param sortField
+     * @param sortOrder
+     * @return
+     */
+    ResponseBean getStatsTimeTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, String sortField, String sortOrder);
+
+    /**
+     * 项目详情统计
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @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);
+
+    /**
+     * 人员城市分布
+     * @param orgId
+     * @return
+     */
+    ResponseBean selectCityPerson(Integer orgId);
 }

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

@@ -1,8 +1,8 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 客户来源  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+public interface ITaCustomerFromService extends IService<TaCustomerFrom> {
+
+}

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

@@ -41,7 +41,7 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
      * @return
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId);
 
     /**
      * 访问量自增

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

@@ -110,4 +110,14 @@ public interface ITaPersonService extends IService<TaPerson> {
      * @return
      */
     Integer savePersonPosition(TaPersonPositon record);
+
+    void authPhone(Integer orgId,
+                   String openid,
+                   String phone,
+                   String buildingId,
+                   String sceneId,
+                   String targetType,
+                   String targetId,
+                   String targetName,
+                   String promoter) throws Exception;
 }

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

@@ -1,18 +1,16 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaRecommendCustomer;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.excel.AgentsRecommendCustomer;
 import com.huiju.estateagents.excel.ExcelRecommendCustomer;
 import com.huiju.estateagents.excel.ReporRecommendCustomer;
-import io.swagger.models.auth.In;
 
-import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -31,66 +29,75 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     ResponseBean updateCustByJSON(String paramStr);
 
-    ResponseBean recommendCust(String paramStr, String openid,Integer orgId);
+    ResponseBean recommendCust(String paramStr, String openid, Integer orgId);
 
-    ResponseBean reportCust(String paramStr, String openid,Integer orgId);
+    ResponseBean reportCust(String paramStr, String openid, Integer orgId);
 
-    IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building,String personId);
+    IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building, String personId);
 
-    IPage getCustomerList(Integer status,int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate);
+    IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName,
+                          String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId,
+                          List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate,
+                          String sharePersonName, Integer belongStatus);
 
-    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
-    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId);
+    IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId);
 
 
-    TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
+    TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);
 
-    TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId);
+    TaPerson getPublicCustomerDetail(String personId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId);
 
     TaRecommendCustomer getCustomerById(String customerId);
 
-    IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     TaRecommendCustomer newByPerson(TaPerson person);
 
     ResponseBean consultantAssist(TaUser taUser, String personId, Integer orgId);
 
     ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId);
+
     /**
      * 导出数据(推荐客户)
+     *
      * @param orgId
      * @return
      */
-    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(推荐客户) 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    Integer getRecCustomerExportCount(Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户) 总数
+     *
      * @param orgId
      * @return
      */
-    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
+    Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(报备客户)
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
-    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList);
+    List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 导出数据(经纪人) 总数
+     *
      * @param orgId
      * @return
      */
@@ -98,22 +105,25 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     /**
      * 导出数据(经纪人)
+     *
      * @param orgId
      * @param pageCode
      * @param pageSize
      * @return
      */
     List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize);
-    
+
     /**
      * 查询我的客户人数集合
+     *
      * @param openid
      * @return
      */
     ResponseBean getMyCustStatistics(String openid);
-    
+
     /**
      * 分页查询我的跟进客户集合
+     *
      * @param pageNumber
      * @param pageSize
      * @param openid
@@ -127,17 +137,19 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      * @return
      */
     ResponseBean getMyCustFollowOrClinch(Integer pageNumber, Integer pageSize, String openid, String type, String name, String phone, Integer status, String startReportDate, String endReportDate, String startArrivalDate, String endArrivalDate);
-    
+
     /**
      * 获取盘客工具下我的客户详情
+     *
      * @param customerId
      * @param openid
      * @return
      */
     ResponseBean getMyCustDetail(String customerId, String openid);
-    
+
     /**
      * 更新我的客户基本信息
+     *
      * @param taRecommendCustomer
      * @param openid
      * @return
@@ -146,6 +158,7 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
 
     /**
      * 查询置业顾问的 归属客户
+     *
      * @param openid
      * @param keywords
      * @param pageNumber
@@ -154,4 +167,14 @@ public interface ITaRecommendCustomerService extends IService<TaRecommendCustome
      */
     ResponseBean getAdminMyCustList(String openid, String keywords, int pageNumber, int pageSize);
 
+    /**
+     * 获取置业顾问下
+     * @param userId
+     * @param personId
+     * @param buildingId
+     * @param orgId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -36,5 +36,5 @@ public interface ITaShareService extends IService<TaShare> {
      * @param top
      * @return
      */
-    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top);
+    List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top, String beginDate, String endDate);
 }

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

@@ -0,0 +1,23 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 活动统计  服务类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+public interface ITsActivityDailyService extends IService<TsActivityDaily> {
+
+    List<TsActivityDaily> getActivityDetail(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId, String targetName, String asc, String desc);
+
+    List<ActivityDailyExport> getActivityExport(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId);
+}

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, Integer userId, String buildingId, String startDate, String endDate, String asc, String desc);
+
+    TsConsultantKpi stsKPITotalByOrg(Integer orgId, Integer userId, String buildingId, String startDate, String endDate);
+
+    List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, Integer userId, 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/ActivityManageServiceImpl.java

@@ -0,0 +1,12 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.base.ResponseBean;
+
+/**
+ * @author gusy
+ * @date 2020/4/26 11:13
+ */
+public interface ActivityManageServiceImpl {
+
+    ResponseBean getStatisticDataByType(String type,String id,Integer orgId);
+}

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

@@ -5,10 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
-import com.huiju.estateagents.exception.EstaException;
+import com.huiju.estateagents.excel.IntentionUser;
+import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
@@ -22,7 +26,10 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -71,14 +78,17 @@ 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 ------------
+        //今日访问次数
+        Integer selectVisitCount = taPersonVisitRecordMapper.selectTodayVisitCount(orgId, LocalDateTime.now());
 
         map.put("selectUserCount", selectUserCount);
         map.put("selectRegisteredCount", selectRegisteredCount);
         map.put("selectRecentlyCount", selectRecentlyCount);
+        map.put("selectVisitCount", selectVisitCount);
 
         responseBean.addSuccess(map);
 
@@ -402,4 +412,284 @@ public class StatisticalServiceImpl implements IStatisticalService {
         });
         return dataList;
     }
+
+    /**
+     * 获取楼盘的折线图统计
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsBarList(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        //项目公客排行折线图获取
+        Map<String,Object> gkBarMap = getGkBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("gkBarMap",gkBarMap);
+
+        //项目私客排行折线图获取
+        Map<String,Object> skBarMap = getSkBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("skBarMap",skBarMap);
+
+        //项目访问人数排行折线图获取
+        Map<String,Object> wgBarMap = getWgBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("wgBarMap",wgBarMap);
+
+        //项目访问次数排行折线图获取
+        Map<String,Object> fwBarMap = getFwBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("fwBarMap",fwBarMap);
+
+        return ResponseBean.success(map);
+    }
+
+    /**
+     * 获取楼盘统计所有数据
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder) {
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        if(StringUtils.isEmpty(sortField)){
+            sortField = "kh_num";
+            orderType = "desc";
+        }
+        IPage<StatsBuilding> pg = new Page<>(pageNum, pageSize);
+        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType);
+        return ResponseBean.success(page);
+    }
+
+    /**
+     * 获取需要导出的数据
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList) {
+        return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList);
+    }
+
+    /**
+     * 按时间获取此楼盘的数据折线图
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTimeBarList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        Map<String,Object> map = new HashMap<>();
+        TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
+        List<StatsTimeBuilding> list = taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId,taBuilding.getBuildingName());
+        //日期维度
+        List<String> timeList = list.stream().map(StatsTimeBuilding::getCreateDate).collect(Collectors.toList());
+        //公客维度
+        List<Integer> gkList = list.stream().map(StatsTimeBuilding::getGkNum).collect(Collectors.toList());
+        //私客维度
+        List<Integer> skList = list.stream().map(StatsTimeBuilding::getSkNum).collect(Collectors.toList());
+        //新增客户维度
+        List<Integer> khList = list.stream().map(StatsTimeBuilding::getKhNum).collect(Collectors.toList());
+        //访问人数维度
+        List<Integer> uvList = list.stream().map(StatsTimeBuilding::getUvNum).collect(Collectors.toList());
+        map.put("list",list);
+        map.put("timeList",timeList);
+        map.put("gkList",gkList);
+        map.put("skList",skList);
+        map.put("khList",khList);
+        map.put("uvList",uvList);
+        return ResponseBean.success(map);
+    }
+
+    /**
+     * 分页统计楼盘详情数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @param sortField
+     * @param sortOrder
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTimeTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, String sortField, String sortOrder) {
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        IPage<StatsTimeBuilding> pg = new Page<>(pageNum, pageSize);
+        IPage<StatsTimeBuilding> page = taBuildingMapper.getStatsTimeTableList(pg, orgId, startDate, endDate, buildingId,sortField,orderType);
+        return ResponseBean.success(page);
+    }
+
+    /**
+     * 项目详情统计
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<StatsTimeBuilding> getExportTimeTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        TaBuilding taBuilding = taBuildingMapper.selectById(buildingId);
+        return taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId,taBuilding.getBuildingName());
+    }
+
+    /**
+     * 意向客户导出
+     *
+     * @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
+     * @return
+     */
+    @Override
+    public ResponseBean selectCityPerson(Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 城市比例
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityPerson(orgId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectCityUser", selectCityUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    /**
+     * 项目公客排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getGkBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> gkBarData = taBuildingMapper.getGkBarData(orgId, startDate, endDate, personBuildingList);
+        if (gkBarData.size() > 0){
+            map.put("data",gkBarData);
+            List<Object> buildingNameList = gkBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = gkBarData.stream().map(x -> x.get("gkNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
+
+    /**
+     * 项目私客排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getSkBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> skBarData = taBuildingMapper.getSkBarData(orgId, startDate, endDate, personBuildingList);
+        if (skBarData.size() > 0){
+            map.put("data",skBarData);
+            List<Object> buildingNameList = skBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = skBarData.stream().map(x -> x.get("skNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
+
+
+    /**
+     * 项目访问人数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getWgBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> wgBarData = taBuildingMapper.getWgBarData(orgId, startDate, endDate, personBuildingList);
+        if (wgBarData.size() > 0){
+            map.put("data",wgBarData);
+            List<Object> buildingNameList = wgBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = wgBarData.stream().map(x -> x.get("wgNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
+
+    /**
+     * 项目访问次数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getFwBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> fwBarData = taBuildingMapper.getFwBarData(orgId, startDate, endDate, personBuildingList);
+        if (fwBarData.size() > 0){
+            map.put("data",fwBarData);
+            List<Object> buildingNameList = fwBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = fwBarData.stream().map(x -> x.get("pvNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
 }

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

@@ -6,18 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import javafx.scene.control.Tab;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.huiju.estateagents.entity.TaCustomerFrom;
+import com.huiju.estateagents.mapper.TaCustomerFromMapper;
+import com.huiju.estateagents.service.ITaCustomerFromService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户来源  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-27
+ */
+@Service
+public class TaCustomerFromServiceImpl extends ServiceImpl<TaCustomerFromMapper, TaCustomerFrom> implements ITaCustomerFromService {
+
+}

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

@@ -104,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
                 liveActivityTitle, cityId, buildingId, status);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId, userId);
     }
 
     @Override

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

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
@@ -18,6 +19,7 @@ import com.huiju.estateagents.event.EventBus;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationContext;
@@ -39,6 +41,7 @@ import java.util.stream.Collectors;
  * @author jobob
  * @since 2019-05-10
  */
+@Slf4j
 @Service
 public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> implements ITaPersonService {
 
@@ -64,17 +67,26 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     TaChatMapper taChatMapper;
 
     @Autowired
-    private ITaRecommendCustomerService iTaRecommendCustomerService;
+    TaUserMapper taUserMapper;
 
     @Autowired
     private TaSaveMapper taSaveMapper;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private TaCustomerFromMapper taCustomerFromMapper;
+
     @Autowired
     private TaActivityDynamicEnlistMapper taActivityDynamicEnlistMapper;
 
     @Autowired
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
+    @Autowired
+    private ITaRecommendCustomerService iTaRecommendCustomerService;
+
     @Autowired
     private ITaPointsRecordsService pointsRecordsService;
 
@@ -86,10 +98,9 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
     @Autowired
     private TaShareContentService taShareContentService;
-    
-    @Autowired
-    private TaBuildingMapper taBuildingMapper;
 
+    @Autowired
+    private TaSharePersonFromServiceImpl taSharePersonFromService;
 
     @Resource
     private ApplicationContext applicationContext;
@@ -132,6 +143,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
             person.setAvatarurl(userInfo.getAvatarUrl());
             person.setNickname(userInfo.getNickName());
+            person.setGender(userInfo.getGender());
+            person.setProvince(userInfo.getProvince());
+            person.setCity(userInfo.getCity());
+            person.setCountry(userInfo.getCountry());
 
             //获取推荐客户表中此人的信息并更新头像和姓名
             updateTaRecommendCustomer(person);
@@ -152,6 +167,10 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
             if (StringUtils.isEmpty(e.getName()) || "匿名用户".equals(e.getName())){
                 e.setName(person.getNickname());
                 e.setPicture(person.getAvatarurl());
+                e.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+                e.setCountry(person.getCountry());
+                e.setCity(person.getCity());
+                e.setProvince(person.getProvince());
                 taRecommendCustomerMapper.updateById(e);
             }
         });
@@ -798,6 +817,8 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
     @Override
     public void upDatePersonCityToId (String personId){
         taPersonMapper.upDatePersonCityToId(personId);
+
+
     }
 
     @Override
@@ -833,6 +854,413 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
         return taPersonMapper.savePersonPosition(record);
     }
 
+    /**
+     * 授权手机号
+     * @param orgId
+     * @param openid
+     * @param phone
+     * @param buildingId
+     * @param sceneId
+     * @param targetType
+     * @param targetId
+     * @param targetName
+     * @param promoter
+     * @throws Exception
+     */
+    @Override
+    public void authPhone(Integer orgId, String openid, String phone, String buildingId, String sceneId, String targetType, String targetId, String targetName, String promoter) throws Exception {
+        log.info("orgId={},openid={},phone={},buildingId={},sceneId={},targetType={},targetId={},targetName={},promoter={}",
+                orgId,openid,phone,buildingId,sceneId,targetType,targetId,targetName,promoter);
+        //
+        LocalDateTime now = LocalDateTime.now();
+
+        // 1. 更新当前人员
+        List<TaPerson> persons = getPersonsByOpenId(openid);
+        if (null == persons || persons.size() != 1) {
+            throw new Exception("当前人员 openid 异常");
+        }
+        TaPerson person = persons.get(0);
+
+        // 更新人员手机号
+        person.setPhone(phone);
+        person.setAuthPhoneTime(now);
+        if (StringUtils.isEmpty(person.getBuildingId())) {
+            person.setBuildingId(buildingId);
+        }
+        if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
+            person.setPersonType(CommConstant.PERSON_ESTATE_CUSTOMER);
+        }
+        updateById(person);
+        fixCustomerPersonId(person);
+
+        // 2. 发放积分
+        applicationContext.publishEvent(new EventBus(person, EventBus.EventType.SignUpAgent, orgId));
+
+        //授权手机给推广人加积分
+        String sharePersonId = getSharePersonFrom(person);
+
+        if (validateSceneId(sceneId) && !StringUtils.isEmpty(sharePersonId)){
+            applicationContext.publishEvent(new EventBus(promoter != null ? promoter : sharePersonId, EventBus.EventType.SharePosterAll, orgId));
+        }
+
+        // 3. 处理推广人
+        TaPerson recPerson = taPersonMapper.getById(promoter);
+        if (recPerson != null && CommConstant.STATUS_DELETE.equals(recPerson.getStatus())) {
+            recPerson = null;
+        }
+
+        TaUser taUser = null;
+        List<String> withBuildings = null;  // 推广人授权的楼盘
+        boolean isAssociated = false;       // 传入的楼盘与推广人是否有关联关系
+        boolean isConsultant = false;       // 是否置业顾问
+        if (!StringUtils.isEmpty(promoter)) {
+            taUser = taUserMapper.getUserByPerson(orgId, promoter);
+            if (null != taUser) {
+                isConsultant = taUser != null && taUser.getIsConsultant() != null && taUser.getIsConsultant();
+                List<TaPerson> userPerons = new ArrayList<>();
+                userPerons.add(recPerson);
+                taUser.setPersonIds(userPerons);
+
+                withBuildings = taUserMapper.getBuildingIdsOf(taUser.getUserId(), null);
+
+                if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
+                    isAssociated = true;
+                } else {
+                    if (null != withBuildings && withBuildings.size() > 0 && !StringUtils.isEmpty(buildingId)) {
+                        isAssociated = withBuildings.contains(buildingId);
+                    }
+                }
+            }
+        }
+
+        // 楼盘
+        TaBuilding taBuilding = null;
+        if (!StringUtils.isEmpty(buildingId)) {
+            taBuilding = taBuildingMapper.selectById(buildingId);
+            if (taBuilding.getStatus().equals(CommConstant.STATUS_DELETE)) {
+                taBuilding = null;
+            }
+        }
+
+        // 没有置业, 也没楼盘
+        if ((recPerson == null || !isConsultant) && taBuilding == null) {
+            TaCustomerFrom customerFrom = new TaCustomerFrom();
+            customerFrom.setPersonId(person.getPersonId());
+            customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+            customerFrom.setTargetType(targetType);
+            customerFrom.setTargetId(targetId);
+            customerFrom.setTargetName(targetName);
+            customerFrom.setOrgId(orgId);
+            customerFrom.setSceneId(sceneId);
+            customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
+            customerFrom.setIsProjectFirst(false);
+            customerFrom.setCreateDate(now);
+            if (null != recPerson) {
+                customerFrom.setSharePersonId(recPerson.getPersonId());
+                customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
+            }
+
+            taCustomerFromMapper.insert(customerFrom);
+
+
+            TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+            customer.setVerifyStatus(CommConstant.VERIFY_READY);
+            customer.setStatus(CommConstant.CUSTOMER_REPORT);
+            customer.setEntryType(CommConstant.ENTRY_INPUT);
+            customer.setCreateDate(now);
+            customer.setReportDate(now);
+            customer.setRecommendPerson(promoter);
+            taRecommendCustomerMapper.insert(customer);
+
+            return ;
+        }
+
+        // 3. 修正客户信息
+        List<TaBuilding> withBuildingList = null;
+        if (null != withBuildings && withBuildings.size() > 0) {
+            QueryWrapper<TaBuilding> queryBuilding = new QueryWrapper<>();
+            queryBuilding.in("building_id", withBuildings);
+            withBuildingList = taBuildingMapper.selectList(queryBuilding);
+        }
+        List<TaRecommendCustomer> customers = mergeCustomerByPhone(person, taUser, taBuilding, withBuildingList, isAssociated, now);
+        if (null == customers || customers.size() == 0) {
+            throw new Exception("生成客户信息异常, 请联系技术人员");
+        }
+
+        // 4. 客户来源, 注意不是用户来源
+        TaCustomerFrom customerFrom = new TaCustomerFrom();
+        customerFrom.setPersonId(person.getPersonId());
+        customerFrom.setPersonName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        customerFrom.setTargetType(targetType);
+        customerFrom.setTargetId(targetId);
+        customerFrom.setTargetName(targetName);
+        customerFrom.setOrgId(orgId);
+        customerFrom.setSceneId(sceneId);
+        customerFrom.setIsOrgFirst(true);   // 授权手机号, 肯定是第一次
+        customerFrom.setCreateDate(now);
+
+        if (null != taBuilding) {
+            customerFrom.setBuildingId(buildingId);
+            customerFrom.setBuildingName(taBuilding.getBuildingName());
+            QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<TaCustomerFrom>();
+            queryWrapper.eq("person_id", person.getPersonId());
+            queryWrapper.eq("org_id", orgId);
+            queryWrapper.eq("building_id", buildingId);
+            if (taCustomerFromMapper.selectList(queryWrapper).size() < 1){
+                customerFrom.setIsProjectFirst(true);
+            }
+
+            for (TaRecommendCustomer cust : customers) {
+                if (buildingId.equals(cust.getBuildingId())) {
+                    customerFrom.setCustomerId(cust.getCustomerId());
+                }
+            }
+        } else if (isConsultant && null != withBuildingList && withBuildingList.size() > 0) {
+            // 没有楼盘则使用置业授权的楼盘
+            customerFrom.setBuildingId(withBuildingList.get(0).getBuildingId());
+            customerFrom.setBuildingName(withBuildingList.get(0).getBuildingName());
+        }
+        if (null != recPerson) {
+            customerFrom.setSharePersonId(recPerson.getPersonId());
+            customerFrom.setSharePersonName(StringUtils.ifNull(recPerson.getName(), recPerson.getNickname()));
+        }
+
+        taCustomerFromMapper.insert(customerFrom);
+    }
+
+    private String getSharePersonFrom(TaPerson person){
+        QueryWrapper<TaSharePersonFrom> taSharePersonFromQueryWrapper = new QueryWrapper<>();
+        taSharePersonFromQueryWrapper.eq("person_id", person.getPersonId());
+        taSharePersonFromQueryWrapper.eq("is_first_time", CommConstant.STATUS_NORMAL);
+        taSharePersonFromQueryWrapper.eq("status", 1);
+        List<TaSharePersonFrom> taSharePersonFroms = taSharePersonFromService.list(taSharePersonFromQueryWrapper);
+        if (CollectionUtils.isEmpty(taSharePersonFroms)){
+            return null;
+        }
+
+        TaSharePersonFrom taSharePersonFrom = taSharePersonFroms.get(0);
+        if (CommConstant.PERSON_REALTY_CONSULTANT.equals(taSharePersonFrom.getSharePersonType())){
+            QueryWrapper<TaPerson> taPersonQueryWrapper = new QueryWrapper<>();
+            taPersonQueryWrapper.eq("user_id" , taSharePersonFrom.getSharePerson());
+            taPersonQueryWrapper.eq("status" , CommConstant.STATUS_NORMAL);
+            TaPerson taPerson = taPersonMapper.selectOne(taPersonQueryWrapper);
+            return taPerson.getPersonId();
+        }
+        return taSharePersonFrom.getSharePerson();
+    }
+
+    public boolean validateSceneId(String sceneId){
+        if ("1047".equals(sceneId) || "1048".equals(sceneId) || "1007".equals(sceneId)){
+            return true;
+        }
+        return false;
+    }
+
+    private void fixCustomerPersonId(TaPerson person) {
+        // 先更新之前的数据, 有一种可能的情况, 客户是推荐的，之前未进入过小程序
+        // 后面所有的查询就可以不需要 phone , 改用 person_id 了
+        QueryWrapper<TaRecommendCustomer> q1 = new QueryWrapper<>();
+        q1.eq("org_id", person.getOrgId());
+        q1.eq("phone", person.getPhone());
+        q1.isNull("person_id");
+        List<TaRecommendCustomer> customers = taRecommendCustomerMapper.selectList(q1);
+        if (null != customers) {
+            for (int i = 0; i < customers.size(); i++) {
+                TaRecommendCustomer cust = customers.get(i);
+                cust = copyByPerosn(person, cust);
+                taRecommendCustomerMapper.updateById(cust);
+            }
+        }
+    }
+
+
+    /**
+     * 此处逻辑按照复杂流程处理
+     * 除了新增客户外，还有修正原有数据的目的
+     * @param person
+     * @param taUser
+     * @param building
+     * @param withBuildings
+     * @param isAssociated
+     * @param now
+     * @return
+     * @throws Exception
+     */
+    private List<TaRecommendCustomer> mergeCustomerByPhone(TaPerson person, TaUser taUser, TaBuilding building, List<TaBuilding> withBuildings, boolean isAssociated, LocalDateTime now) throws Exception {
+
+        /**
+         * 新增客户流程
+         * 1. 推广人是置业, 楼盘跟置业关联 => return 新增一条客户
+         * 2. 有楼盘  => 新增一条项目公客  continue
+         * 3. 有推广人 => 更新为私客, 或者新增一条公客 continue
+         * 4. return
+         */
+
+        TaPerson recPerson = null;
+        if (null != taUser) {
+            recPerson = taUser.getPersonIds().get(0);
+        }
+        // 推广人是否置业
+        boolean isConsultant = taUser != null && taUser.getIsConsultant() != null && taUser.getIsConsultant();
+        // 置业授权的楼盘
+        TaBuilding taBuilding = null != withBuildings ? withBuildings.get(0) : null;
+
+        // 1. 如果置业跟楼盘是关联的
+        if (isAssociated) {
+            // 查询是否已经存在记录
+            QueryWrapper<TaRecommendCustomer> q2 = new QueryWrapper<>();
+            q2.eq("org_id", person.getOrgId());
+            q2.eq("building_id", building.getBuildingId());
+            q2.eq("person_id", person.getPersonId());
+            List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q2);
+
+            if (null == existsRows || existsRows.size() < 1) {
+                TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                customer.setEntryType(CommConstant.ENTRY_INPUT);
+                customer.setCreateDate(now);
+                customer.setReportDate(now);
+                customer.setRecommendPerson(recPerson.getPersonId());
+                customer.setRealtyConsultant(taUser.getUserId().toString());
+                customer.setBuildingId(building.getBuildingId());
+                customer.setIntention(building.getBuildingName());
+                taRecommendCustomerMapper.insert(customer);
+
+                return new ArrayList<TaRecommendCustomer>(){{
+                    add(customer);
+                }};
+            }
+        }
+
+        // 2. 有楼盘
+        if (null != building) {
+            // 查询是否已经存在记录
+            QueryWrapper<TaRecommendCustomer> q3 = new QueryWrapper<>();
+            q3.eq("org_id", person.getOrgId());
+            q3.eq("building_id", building.getBuildingId());
+            q3.eq("person_id", person.getPersonId());
+            List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q3);
+
+            if (null == existsRows || existsRows.size() < 1) {
+                TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                customer.setEntryType(CommConstant.ENTRY_INPUT);
+                customer.setCreateDate(now);
+                customer.setReportDate(now);
+                customer.setBuildingId(building.getBuildingId());
+                customer.setIntention(building.getBuildingName());
+                taRecommendCustomerMapper.insert(customer);
+            }
+        }
+
+        // 3. 有推广人
+        if (null != recPerson) {
+            if (isConsultant) {
+                // 如果是置业, 需要验证是否置业所在项目的客户
+                if (null != taBuilding) {
+                    // 查询是否已经存在记录
+                    // 客户是以项目为纬度的, 因此验证查询不能加置业的条件
+                    QueryWrapper<TaRecommendCustomer> q4 = new QueryWrapper<>();
+                    q4.eq("org_id", person.getOrgId());
+                    q4.eq("building_id", taBuilding.getBuildingId());
+                    q4.eq("person_id", person.getPersonId());
+                    List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q4);
+
+                    if (null == existsRows || existsRows.size() < 1) {
+                        TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                        customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                        customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                        customer.setEntryType(CommConstant.ENTRY_INPUT);
+                        customer.setCreateDate(now);
+                        customer.setReportDate(now);
+                        customer.setRecommendPerson(recPerson.getPersonId());
+                        customer.setRealtyConsultant(taUser.getUserId().toString());
+                        customer.setBuildingId(taBuilding.getBuildingId());
+                        customer.setIntention(taBuilding.getBuildingName());
+                        taRecommendCustomerMapper.insert(customer);
+                    } else {
+                        // 如果存在项目公客, 把公客绑定为置业的私客
+                        for (int i = 0; i < existsRows.size(); i ++) {
+                            TaRecommendCustomer cust = existsRows.get(0);
+                            if (StringUtils.isEmpty(cust.getRealtyConsultant())) {
+                                cust.setRealtyConsultant(taUser.getUserId().toString());
+                                cust.setReportDate(now);    // 这个更新会覆盖原来的真实时间
+                                taRecommendCustomerMapper.updateById(cust);
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+
+            // 如果不是置业, 那么就是普通人推荐
+            // 如果置业没有绑定项目, 则认为置业是以普通人身份推荐
+            // 新增一个公客
+            if (!isConsultant || null == taBuilding) {
+                // 查询是否已经存在记录
+                QueryWrapper<TaRecommendCustomer> q5 = new QueryWrapper<>();
+                q5.eq("org_id", person.getOrgId());
+                q5.eq("person_id", person.getPersonId());
+                List<TaRecommendCustomer> existsRows = taRecommendCustomerMapper.selectList(q5);
+
+                if (null == existsRows || existsRows.size() < 1) {
+                    TaRecommendCustomer customer = copyByPerosn(person, new TaRecommendCustomer());
+                    customer.setVerifyStatus(CommConstant.VERIFY_AGREE);
+                    customer.setStatus(CommConstant.CUSTOMER_REPORT);
+                    customer.setEntryType(CommConstant.ENTRY_INPUT);
+                    customer.setCreateDate(now);
+                    customer.setReportDate(now);
+                    customer.setRecommendPerson(recPerson.getPersonId());
+                    taRecommendCustomerMapper.insert(customer);
+                }
+            }
+        }
+
+        // 返回当前人作为客户的数据
+        QueryWrapper<TaRecommendCustomer> query = new QueryWrapper<>();
+        query.eq("org_id", person.getOrgId());
+        query.eq("person_id", person.getPersonId());
+
+        List<String> buildingIds = new ArrayList<>();
+        if (null != building) {
+            buildingIds.add(building.getBuildingId());
+        }
+        if (null != taBuilding) {
+            buildingIds.add(taBuilding.getBuildingId());
+        }
+
+        query.in(buildingIds.size() > 0,"building_id", buildingIds);
+        query.orderByAsc("create_date");
+        return taRecommendCustomerMapper.selectList(query);
+    }
+
+    private TaRecommendCustomer copyByPerosn(TaPerson person, TaRecommendCustomer cust) {
+        cust.setPersonId(person.getPersonId());
+        cust.setName(StringUtils.ifNull(person.getName(), person.getNickname()));
+        cust.setSex(null == person.getSex() ? str2Int(person.getGender()) : person.getSex());
+        cust.setPhone(StringUtils.ifNull(person.getPhone(), person.getTel()));
+        cust.setPicture(StringUtils.ifNull(person.getAvatarurl(), person.getPhoto()));
+        cust.setCountry(person.getCountry());
+        cust.setCity(person.getCity());
+        cust.setProvince(person.getProvince());
+        cust.setOrgId(person.getOrgId());
+
+        return cust;
+    }
+
+    private Integer str2Int(String str) {
+        if (null == str) {
+            return null;
+        }
+
+        try {
+            return Integer.valueOf(str);
+        } catch (Exception e) {
+            return 0;
+        }
+    }
 
     public String codeGenerator (){
         double r = Math.random();

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

@@ -64,7 +64,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Autowired
     private TdCityMapper cityMapper;
-    
+
     @Autowired
     private TaCustomerFollowUpRecordMapper customerFollowUpRecordMapper;
 
@@ -98,6 +98,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     @Autowired
     private TdWxDictMapper tdWxDictMapper;
 
+    @Autowired
+    private TaCustomerFromMapper taCustomerFromMapper;
+
+    @Autowired
+    private TaSharePersonFromMapper taSharePersonFromMapper;
+
     @Override
     public ResponseBean getMyCustList(String openid, String keywords, int pageNumber, int pageSize) {
         List<TaPerson> taPersons = getPersonsByOpenId(openid);
@@ -142,6 +148,21 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         return ResponseBean.success(result);
     }
 
+    /**
+     * 获取置业顾问下
+     *
+     * @param userId
+     * @param personId
+     * @param buildingId
+     * @param orgId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<TaRecommendCustomer> getConsultantCustomerList(Integer userId, String personId, String buildingId, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taRecommendCustomerMapper.getConsultantCustomerList(userId,personId,buildingId,orgId);
+    }
+
     @Override
     public ResponseBean getCustDetail(String id) {
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.selectById(id);
@@ -211,7 +232,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public synchronized ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
+    public synchronized ResponseBean recommendCust(String paramStr, String openid, Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -227,8 +248,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             return ResponseBean.error(checkResult, ResponseBean.ERROR_MISSING_PARAMS);
         }
 
-        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
+        // 报备有 10 天有效期
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("phone", params.getString("phone"));
+        queryWrapper.eq("building_id", params.getString("intention"));
+        queryWrapper.in("verify_status", CommConstant.VERIFY_AGREE, CommConstant.VERIFY_READY);
+        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
+        if (null != result && result.size() > 0) {
+            return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
+        }
 
+        TaRecommendCustomer taRecommendCustomer = new TaRecommendCustomer();
         taRecommendCustomer.setName(params.getString("name"));
         taRecommendCustomer.setPicture(params.getString("picture"));
         taRecommendCustomer.setPhone(params.getString("phone"));
@@ -242,11 +272,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setCreateDate(LocalDateTime.now());
         taRecommendCustomer.setReportDate(LocalDateTime.now());
         taRecommendCustomer.setOrgId(orgId);
-       QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-       personQueryWrapper.eq("org_id",orgId);
-       personQueryWrapper.eq("phone",params.getString("phone"));
+        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+        personQueryWrapper.eq("org_id", orgId);
+        personQueryWrapper.eq("phone", params.getString("phone"));
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
-        if(null != currentPerson){
+        if (null != currentPerson) {
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
         }
 
@@ -271,24 +301,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
         String status = params.getString("status");
         int statusInt = 0;
-        if (StringUtils.isEmpty(status)){
+        if (StringUtils.isEmpty(status)) {
             taRecommendCustomer.setStatus(statusInt);
-        }else{
+        } else {
             taRecommendCustomer.setStatus(Integer.parseInt(status));
         }
 
         taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
 
-        // 报备有 10 天有效期
-        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("phone", taRecommendCustomer.getPhone());
-        queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
-        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
-        List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
-        if (null != result && result.size() > 0) {
-            return ResponseBean.error("当前客户已被推荐, 不能再次推荐", ResponseBean.ERROR_ILLEGAL_PARAMS);
-        }
-
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
             return ResponseBean.error("推荐客户失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -305,9 +325,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
 
-
     @Override
-    public ResponseBean reportCust(String paramStr, String openid,Integer orgId) {
+    public ResponseBean reportCust(String paramStr, String openid, Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);
@@ -361,12 +380,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setDescribe(params.getString("describe"));
         taRecommendCustomer.setRealtyConsultant(consultantUser.getUserId().toString());
         //如果没有传building_id的情况构造building_id
-        if (StringUtils.isEmpty(params.getString("buildingId")) && !StringUtils.isEmpty(params.getString("realtyConsultant"))){
+        if (StringUtils.isEmpty(params.getString("buildingId")) && !StringUtils.isEmpty(params.getString("realtyConsultant"))) {
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("person_id", consultantPerson.getPersonId()).or().eq("user_id", consultantUser.getUserId());
             List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingMapper.selectList(taPersonBuildingQueryWrapper);
-            if (taPersonBuildingList.size() > 0){
-                params.put("buildingId",taPersonBuildingList.get(0).getBuildingId());
+            if (taPersonBuildingList.size() > 0) {
+                params.put("buildingId", taPersonBuildingList.get(0).getBuildingId());
             }
         }
         taRecommendCustomer.setBuildingId(params.getString("buildingId"));
@@ -393,11 +412,11 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         taRecommendCustomer.setVerifyStatus(CommConstant.VERIFY_AGREE);
         taRecommendCustomer.setStatus(CommConstant.CUSTOMER_REPORT);
         QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
-        personQueryWrapper.eq("org_id",orgId);
-        personQueryWrapper.eq("phone",params.getString("phone"));
+        personQueryWrapper.eq("org_id", orgId);
+        personQueryWrapper.eq("phone", params.getString("phone"));
         TaPerson currentPerson = taPersonMapper.selectOne(personQueryWrapper);
-        if(null != currentPerson){
-            if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)){
+        if (null != currentPerson) {
+            if (currentPerson.getPersonType().equals(CommConstant.PERSON_REALTY_CONSULTANT)) {
                 return ResponseBean.error("置业顾问不可以绑定置业顾问", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
             taRecommendCustomer.setPersonId(currentPerson.getPersonId());
@@ -410,38 +429,91 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 //        taRecommendCustomer.setRecommendPerson(taPerson.getPersonId());
         taRecommendCustomer.setRecommendPerson(params.getString("realtyConsultant"));
 
+        // 插入客户来源逻辑, 防止下面 if 里面的 return
+        // 首次报备的客户, 写入客户来源表
+        TaCustomerFrom customerFrom = null;
+        if (!StringUtils.isEmpty(taRecommendCustomer.getBuildingId())) {
+            Map<String, Number> counter = taCustomerFromMapper.countPerson(taRecommendCustomer.getOrgId(), taRecommendCustomer.getBuildingId(), taRecommendCustomer.getPersonId());
+            boolean orgFirst = counter.get("orgCount").longValue() < 1;
+            boolean projectFirst = counter.get("projectCount").longValue() < 1;
+            if (projectFirst) {
+                TaBuilding taBuilding = taBuildingMapper.selectById(taRecommendCustomer.getBuildingId());
+
+                customerFrom = new TaCustomerFrom();
+                customerFrom.setPersonId(taRecommendCustomer.getPersonId());
+                customerFrom.setCustomerId(taRecommendCustomer.getCustomerId());
+                customerFrom.setPersonName(taRecommendCustomer.getName());
+                customerFrom.setOrgId(taRecommendCustomer.getOrgId());
+//              customerFrom.setSceneId(sceneId);
+                customerFrom.setIsOrgFirst(orgFirst);
+                QueryWrapper<TaCustomerFrom> queryWrapper = new QueryWrapper<TaCustomerFrom>();
+                queryWrapper.eq("person_id", taRecommendCustomer.getPersonId());
+                queryWrapper.eq("org_id", taRecommendCustomer.getOrgId());
+                queryWrapper.eq("building_id", taRecommendCustomer.getBuildingId());
+                if (taCustomerFromMapper.selectList(queryWrapper).size() < 1) {
+                    customerFrom.setIsProjectFirst(true);
+                }
+                customerFrom.setCreateDate(LocalDateTime.now());
+                customerFrom.setBuildingId(taRecommendCustomer.getBuildingId());
+                customerFrom.setBuildingName(taBuilding.getBuildingName());
+                customerFrom.setSharePersonId(consultantPerson.getPersonId());
+                customerFrom.setSharePersonName(consultantUser.getUserName());
+
+                // 半小时内如果有当前人员的分享记录
+                // 那么就认为当前客户是通过分享进入的
+                TaSharePersonFrom personShare = taSharePersonFromMapper.getConsultantLastShare(taRecommendCustomer.getOrgId(),
+                        taRecommendCustomer.getBuildingId(),
+                        consultantUser.getUserId(),
+                        taRecommendCustomer.getPersonId());
+                if (null != personShare) {
+                    // 强制转换 targetType
+                    String targetType = personShare.getTargetType().replace("_share", "").replace("dynamic", "activity");
+                    customerFrom.setTargetType(targetType);
+                    customerFrom.setTargetId(personShare.getTargetId());
+                    customerFrom.setTargetName(personShare.getTargetName());
+                }
+
+                taCustomerFromMapper.insert(customerFrom);
+            }
+        }
+
+
         // 报备有 10 天有效期
         QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("phone", taRecommendCustomer.getPhone());
-        queryWrapper.eq("building_id",taRecommendCustomer.getBuildingId());
+        queryWrapper.eq("building_id", taRecommendCustomer.getBuildingId());
         queryWrapper.eq("org_id", taRecommendCustomer.getOrgId());
-        queryWrapper.in("verify_status",CommConstant.VERIFY_AGREE,CommConstant.VERIFY_READY);
+        queryWrapper.in("verify_status", CommConstant.VERIFY_AGREE, CommConstant.VERIFY_READY);
         List<TaRecommendCustomer> result = taRecommendCustomerMapper.selectList(queryWrapper);
         if (null != result && result.size() > 0) {
             String conName = "";
             TaPerson conPerson = taPersonMapper.selectById(result.get(0).getRealtyConsultant());
-            if (null != conPerson){
-                if(null != consultantPerson && consultantPerson.getPersonId().equals(conPerson.getPersonId())){
-                   return  ResponseBean.success("bound");
+            if (null != conPerson) {
+                if (null != consultantPerson && consultantPerson.getPersonId().equals(conPerson.getPersonId())) {
+                    return ResponseBean.success("bound");
                 }
                 conName = conPerson.getName();
-            }else {
+            } else {
                 TaUser conUser = userService.getById(result.get(0).getRealtyConsultant());
-                if(null != conUser){
-                    if(consultantUser.getUserId().equals(conUser.getUserId())){
+                if (null != conUser) {
+                    if (consultantUser.getUserId().equals(conUser.getUserId())) {
                         return ResponseBean.success("bound");
                     }
                     conName = conUser.getUserName();
 
                 }
             }
-            return ResponseBean.error("您在当前项目的置业顾问是:"+conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
+            return ResponseBean.error("您在当前项目的置业顾问是:" + conName, ResponseBean.ERROR_ILLEGAL_PARAMS);
         }
 
         int row = taRecommendCustomerMapper.insert(taRecommendCustomer);
         if (row < 1) {
             return ResponseBean.error("报备客户失败", ResponseBean.ERROR_UNAVAILABLE);
         }
+        if (null != customerFrom) {
+            customerFrom.setCustomerId(taRecommendCustomer.getCustomerId());
+            taCustomerFromMapper.updateById(customerFrom);
+        }
 
         // 找到销售经理，并推送消息
 //        TaPerson saleMan = taPersonMapper.getSalesExecutive();
@@ -471,106 +543,104 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
 
-
-
     List<TaPerson> getPersonsByOpenId(String openid) {
         return taPersonMapper.getPersonByOpenId(openid);
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize,String building,String personId){
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+    public IPage<TaRecommendCustomer> getUnSignedCustomerList(int pageNumber, int pageSize, String building, String personId) {
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq("building_id",building);
-        queryWrapper.eq("realty_consultant",personId);
+        queryWrapper.eq("realty_consultant", personId);
         queryWrapper.gt("status", CommConstant.MESSAGE_UNREAD);
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.selectPage(page,queryWrapper);
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.selectPage(page, queryWrapper);
     }
 
     @Override
-    public IPage getCustomerList(Integer status,int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, String customerType, Integer orgId,List<TaPersonBuilding> taPersonBuildingList,String sceneType, String startCreateDate, String endCreateDate){
+    public IPage getCustomerList(Integer status, int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, String customerType, Integer orgId, List<TaPersonBuilding> taPersonBuildingList, String sceneType, String startCreateDate, String endCreateDate, String sharePersonName, Integer belongStatus) {
 
         if (CommConstant.CUTOMER_TYPE_PUBLIC.equals(customerType)) {
             // 公客
-            IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
+            IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
             // 公客就不用 buildingId 进行查询
-            return taRecommendCustomerMapper.getPublicCustomerList(page,name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType, taPersonBuildingList,building, startCreateDate, endCreateDate);
+            return taRecommendCustomerMapper.getPublicCustomerList(page, name, tel, entryType, verifyStatus, sex, orgId, consultTel, sceneType, taPersonBuildingList, building, startCreateDate, endCreateDate, sharePersonName, belongStatus);
         } else {
             // 私客
-            IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,status,taPersonBuildingList,sceneType, startCreateDate, endCreateDate);
+            IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+            return taRecommendCustomerMapper.getCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, status, taPersonBuildingList, sceneType, startCreateDate, endCreateDate, sharePersonName);
         }
 
     }
 
     @Override
-    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize,String name,String tel, Integer orgId){
-        IPage<TaPerson>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getIndependentAgents(page,name,tel, orgId);
+    public IPage<TaPerson> getIndependentAgents(int pageNumber, int pageSize, String name, String tel, Integer orgId) {
+        IPage<TaPerson> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.getIndependentAgents(page, name, tel, orgId);
     }
 
     @Override
-    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRecCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
+    public IPage<TaRecommendCustomer> getRecCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.getRecCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, taPersonBuildingList);
     }
 
 
     @Override
-    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize,String building,String name,String tel,String consultName,String consultTel,String entryType,String verifyStatus,Integer sex, Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
-        return taRecommendCustomerMapper.getRepCustomerList(page,building,name,tel,consultName,consultTel,entryType,verifyStatus,sex, orgId,taPersonBuildingList);
+    public IPage<TaRecommendCustomer> getRepCustomerList(int pageNumber, int pageSize, String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
+        return taRecommendCustomerMapper.getRepCustomerList(page, building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, taPersonBuildingList);
     }
 
     @Override
-    public TaRecommendCustomer getCustomerById(String customerId){
+    public TaRecommendCustomer getCustomerById(String customerId) {
         return taRecommendCustomerMapper.getCustomerById(customerId);
     }
 
 
     @Override
-    public TaRecommendCustomer getCustomerDetail(String customerId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
+    public TaRecommendCustomer getCustomerDetail(String customerId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId) {
         String personId = taRecommendCustomerMapper.getCustomerById(customerId).getPersonId();
-        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId,personId);
+        TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getCustomerDetail(customerId, personId);
         TaPerson person = taPersonMapper.selectById(personId);
-        if(!StringUtils.isEmpty(personId)){
-            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
+        if (!StringUtils.isEmpty(personId)) {
+            IPage<TaPersonVisitRecord> page = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page, personId, taPersonBuildingList, buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-                    if (null != taBuildingDynamic){
+                    if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
                     }
 
                 }
                 //获取拼团标题
-                if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("group".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-                    if (null != taShareActivity){
+                    if (null != taShareActivity) {
                         e.setActivityName(taShareActivity.getActivityName());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("help".equals(e.getEventType()) && null != e.getTargetId()) {
                     HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity){
+                    if (null != helpActivity) {
                         e.setActivityName(helpActivity.getTitle());
                     }
                 }
                 //获取咨询标题
-                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-                    if (null != taNews){
+                    if (null != taNews) {
                         e.setActivityName(taNews.getNewsName());
                     }
                 }
                 //获取H5活动标题
-                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-                    if (null != taDrainage){
+                    if (null != taDrainage) {
                         e.setActivityName(taDrainage.getName());
                     }
                 }
@@ -578,19 +648,19 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taRecommendCustomer.setVisitRecords(taPersonVisitRecordIPage);
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId, taPersonBuildingList));
         }
-        if(!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())){
-            TaPerson consultant =  taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
+        if (!StringUtils.isEmpty(taRecommendCustomer.getRealtyConsultant())) {
+            TaPerson consultant = taPersonMapper.getById(taRecommendCustomer.getRealtyConsultant());
             TaUser user = new TaUser();
-            if(null == consultant){
+            if (null == consultant) {
                 user = userService.getById(taRecommendCustomer.getRealtyConsultant());
-            }else {
+            } else {
                 user = userService.getById(consultant.getUserId());
             }
-            if (null != user){
+            if (null != user) {
                 List<String> projects = taPersonMapper.getUserProjects(user.getUserId());
-                if (projects.size()>0){
+                if (projects.size() > 0) {
                     user.setProjects(projects);
                 }
                 taRecommendCustomer.setConsultant(user);
@@ -598,26 +668,26 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
         //构造来源类型
         taRecommendCustomer.setPersonFrom("");
-        if (null != person){
-            Map<String,String>geoInfo = new HashMap<>();
-            geoInfo.put("provience",person.getProvince());
-            geoInfo.put("country",person.getCountry());
+        if (null != person) {
+            Map<String, String> geoInfo = new HashMap<>();
+            geoInfo.put("provience", person.getProvince());
+            geoInfo.put("country", person.getCountry());
             TdCity city = cityMapper.selectById(person.getCity());
-            if(null!=city){
-                geoInfo.put("city",city.getName());
-            }else {
-                geoInfo.put("city","未知");
+            if (null != city) {
+                geoInfo.put("city", city.getName());
+            } else {
+                geoInfo.put("city", "未知");
             }
             taRecommendCustomer.setGeoInfo(geoInfo);
 
             QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",person.getOrgId());
-            queryWrapper.eq("person_id",person.getPersonId());
-            queryWrapper.eq("is_first_time",1);
+            queryWrapper.eq("org_id", person.getOrgId());
+            queryWrapper.eq("person_id", person.getPersonId());
+            queryWrapper.eq("is_first_time", 1);
             List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
-            if (taPersonFromRecords.size() > 0){
+            if (taPersonFromRecords.size() > 0) {
                 QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
-                tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                tdWxDictQueryWrapper.eq("scene_id", taPersonFromRecords.get(0).getSceneId());
                 TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
                 taRecommendCustomer.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
             }
@@ -627,46 +697,46 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public TaPerson getPublicCustomerDetail(String personId,int pageNumber, int pageSize,List<TaPersonBuilding> taPersonBuildingList,String buildingId){
+    public TaPerson getPublicCustomerDetail(String personId, int pageNumber, int pageSize, List<TaPersonBuilding> taPersonBuildingList, String buildingId) {
         TaPerson taPerson = taPersonMapper.getById(personId);
-        if(!StringUtils.isEmpty(personId)){
-            IPage<TaPersonVisitRecord>page = new Page<>(pageNumber,pageSize);
-            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page,personId,taPersonBuildingList,buildingId);
+        if (!StringUtils.isEmpty(personId)) {
+            IPage<TaPersonVisitRecord> page = new Page<>(pageNumber, pageSize);
+            IPage<TaPersonVisitRecord> taPersonVisitRecordIPage = taPersonVisitRecordMapper.visitRecordByPersonId(page, personId, taPersonBuildingList, buildingId);
             List<TaPersonVisitRecord> records = taPersonVisitRecordIPage.getRecords();
             records.forEach(e -> {
                 //获取活动标题
-                if ("activity".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("activity".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectById(e.getTargetId());
-                    if (null != taBuildingDynamic){
+                    if (null != taBuildingDynamic) {
                         e.setActivityName(taBuildingDynamic.getTitle());
                     }
 
                 }
                 //获取拼团标题
-                if ("group".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("group".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaShareActivity taShareActivity = taShareActivityMapper.selectById(e.getTargetId());
-                    if (null != taShareActivity){
+                    if (null != taShareActivity) {
                         e.setActivityName(taShareActivity.getActivityName());
                     }
                 }
                 //获取助力标题
-                if ("help".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("help".equals(e.getEventType()) && null != e.getTargetId()) {
                     HelpActivity helpActivity = helpActivityMapper.selectById(e.getTargetId());
-                    if (null != helpActivity){
+                    if (null != helpActivity) {
                         e.setActivityName(helpActivity.getTitle());
                     }
                 }
                 //获取咨询标题
-                if ("news".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("news".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaNews taNews = taNewsMapper.selectById(e.getTargetId());
-                    if (null != taNews){
+                    if (null != taNews) {
                         e.setActivityName(taNews.getNewsName());
                     }
                 }
                 //获取H5活动标题
-                if ("h5".equals(e.getEventType()) && null != e.getTargetId()){
+                if ("h5".equals(e.getEventType()) && null != e.getTargetId()) {
                     TaDrainage taDrainage = taDrainageMapper.selectById(e.getTargetId());
-                    if (null != taDrainage){
+                    if (null != taDrainage) {
                         e.setActivityName(taDrainage.getName());
                     }
                 }
@@ -674,25 +744,25 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
             taPersonVisitRecordIPage.setRecords(records);
             taPerson.setVisitRecords(taPersonVisitRecordIPage);
             taPerson.setVisitTimes(taPersonVisitRecordIPage.getRecords().size());
-            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId,taPersonBuildingList));
+            taPerson.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId, taPersonBuildingList));
             taPerson.setDuration(taPersonVisitRecordMapper.getDurationByPersonId(personId));
             taPerson.setVisitTime(taPersonVisitRecordMapper.getFirstVisitTimeByPersonId(personId));
             TdCity city = cityMapper.selectById(taPerson.getCity());
-            if(null != city){
+            if (null != city) {
                 taPerson.setCity(city.getName());
             }
 
             //构造来源类型
             taPerson.setPersonFrom("");
-            if (null != taPerson){
+            if (null != taPerson) {
                 QueryWrapper<TaPersonFromRecord> queryWrapper = new QueryWrapper<>();
-                queryWrapper.eq("org_id",taPerson.getOrgId());
-                queryWrapper.eq("person_id",taPerson.getPersonId());
-                queryWrapper.eq("is_first_time",1);
+                queryWrapper.eq("org_id", taPerson.getOrgId());
+                queryWrapper.eq("person_id", taPerson.getPersonId());
+                queryWrapper.eq("is_first_time", 1);
                 List<TaPersonFromRecord> taPersonFromRecords = taPersonFromRecordMapper.selectList(queryWrapper);
-                if (taPersonFromRecords.size() > 0){
+                if (taPersonFromRecords.size() > 0) {
                     QueryWrapper<TdWxDict> tdWxDictQueryWrapper = new QueryWrapper<>();
-                    tdWxDictQueryWrapper.eq("scene_id",taPersonFromRecords.get(0).getSceneId());
+                    tdWxDictQueryWrapper.eq("scene_id", taPersonFromRecords.get(0).getSceneId());
                     TdWxDict tdWxDict = tdWxDictMapper.selectOne(tdWxDictQueryWrapper);
                     taPerson.setPersonFrom(null != tdWxDict ? tdWxDict.getSceneAlias() : "");
                 }
@@ -702,17 +772,17 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public IPage<TaRecommendCustomer>getCustomersIRecommended(int pageNumber, int pageSize,String customerId,Integer orgId,List<TaPersonBuilding> taPersonBuildingList){
+    public IPage<TaRecommendCustomer> getCustomersIRecommended(int pageNumber, int pageSize, String customerId, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
 
-        QueryWrapper<TaRecommendCustomer>queryWrapper = new QueryWrapper<>();
+        QueryWrapper<TaRecommendCustomer> queryWrapper = new QueryWrapper<>();
         // todo
         // 此处可能不是 person_id 而是 recommend_person
-        IPage<TaRecommendCustomer>page = new Page<>(pageNumber,pageSize);
+        IPage<TaRecommendCustomer> page = new Page<>(pageNumber, pageSize);
 //        queryWrapper.eq("recommend_person",customerId);
 ////        queryWrapper.eq("building_id",building);
 //        queryWrapper.eq("status", CommConstant.VERIFY_AGREE);
 //        queryWrapper.eq("org_id", orgId);
-        return taRecommendCustomerMapper.getCustomersIRecommended(page,customerId,CommConstant.STATUS_NORMAL,orgId,taPersonBuildingList);
+        return taRecommendCustomerMapper.getCustomersIRecommended(page, customerId, CommConstant.STATUS_NORMAL, orgId, taPersonBuildingList);
     }
 
     @Override
@@ -754,8 +824,8 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Override
     public ResponseBean batchConsultantAssist(TaUser taUser, Integer orgId) {
-        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())){
-            for (TaPerson taPerson : taUser.getPersonIds()){
+        if (CollectionUtils.isNotEmpty(taUser.getPersonIds())) {
+            for (TaPerson taPerson : taUser.getPersonIds()) {
                 consultantAssist(taUser, taPerson.getPersonId(), orgId);
             }
         }
@@ -834,24 +904,24 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
 
     @Override
-    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize,taPersonBuildingList);
+    public List<ExcelRecommendCustomer> getRecCustomerExport(Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExport(orgId, pageCode, pageSize, taPersonBuildingList);
     }
 
     @Override
-    public Integer getRecCustomerExportCount(Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId,taPersonBuildingList);
+    public Integer getRecCustomerExportCount(Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRecCustomerExportCount(orgId, taPersonBuildingList);
     }
 
 
     @Override
-    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId,taPersonBuildingList);
+    public Integer getRepCustomerReportCount(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportCount(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, taPersonBuildingList);
     }
 
     @Override
-    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize,List<TaPersonBuilding> taPersonBuildingList) {
-        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType,verifyStatus,sex, orgId, pageCode, pageSize,taPersonBuildingList);
+    public List<ReporRecommendCustomer> getRepCustomerReportExport(String building, String name, String tel, String consultName, String consultTel, String entryType, String verifyStatus, Integer sex, Integer orgId, Integer pageCode, Integer pageSize, List<TaPersonBuilding> taPersonBuildingList) {
+        return taRecommendCustomerMapper.getRepCustomerReportExport(building, name, tel, consultName, consultTel, entryType, verifyStatus, sex, orgId, pageCode, pageSize, taPersonBuildingList);
     }
 
 
@@ -864,7 +934,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
         return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
     }
-    
+
     /**
      * 查询我的客户人数集合
      *
@@ -877,12 +947,12 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
-        Map<String,Object> map = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId());
+        Map<String, Object> map = taRecommendCustomerMapper.getMyCustStatistics(taPerson.getPersonId(), taPerson.getUserId(), taPerson.getOrgId());
         return ResponseBean.success(map);
     }
-    
+
     /**
      * 分页查询我的跟进客户集合
      *
@@ -904,18 +974,18 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
-        
+
         IPage<TaRecommendCustomer> page = new Page<>();
         page.setCurrent(pageNumber);
         page.setSize(pageSize);
-        
+
         //分页获取跟进客户status != 4的为跟进客户， status = 4的为成交客户 根据type区分  follow 跟进  clinch 成交
-        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(),taPerson.getUserId(),taPerson.getOrgId(), type,name,phone,status,startReportDate,endReportDate,startArrivalDate,endArrivalDate);
+        IPage<TaRecommendCustomer> result = taRecommendCustomerMapper.getMyCustFollowOrClinch(page, taPerson.getPersonId(), taPerson.getUserId(), taPerson.getOrgId(), type, name, phone, status, startReportDate, endReportDate, startArrivalDate, endArrivalDate);
         return ResponseBean.success(result);
     }
-    
+
     /**
      * 获取盘客工具下我的客户详情
      *
@@ -929,14 +999,14 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
         TaRecommendCustomer taRecommendCustomer = taRecommendCustomerMapper.getMyCustDetailById(customerId);
         //添加跟进行为
-        addCustomerFpllowUp(taPerson,taRecommendCustomer,"查看客户详情");
+        addCustomerFpllowUp(taPerson, taRecommendCustomer, "查看客户详情");
         return ResponseBean.success(taRecommendCustomer);
     }
-    
+
     /**
      * 更新我的客户基本信息
      *
@@ -950,16 +1020,16 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         if (null == taPersons || taPersons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-    
+
         TaPerson taPerson = taPersons.get(0);
         taRecommendCustomerMapper.updateById(taRecommendCustomer);
         //添加跟进行为
-        addCustomerFpllowUp(taPerson,taRecommendCustomer,"编辑客户信息");
+        addCustomerFpllowUp(taPerson, taRecommendCustomer, "编辑客户信息");
         return ResponseBean.success(taRecommendCustomer);
     }
-    
+
     //添加跟进行为
-    private void addCustomerFpllowUp(TaPerson taPerson,TaRecommendCustomer taRecommendCustomer,String recordType) {
+    private void addCustomerFpllowUp(TaPerson taPerson, TaRecommendCustomer taRecommendCustomer, String recordType) {
         TaCustomerFollowUpRecord taCustomerFollowUpRecord = new TaCustomerFollowUpRecord();
         taCustomerFollowUpRecord.setOrgId(taPerson.getOrgId());
         taCustomerFollowUpRecord.setCreateDate(LocalDateTime.now());

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

@@ -71,7 +71,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             taBuildingDynamicQuery.eq("dynamic_id",id);
             TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
             taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum() == null ? 1:taBuildingDynamic.getShareNum()+1));
-//            return ResponseBean.success("成功");
         }
 
         TaShareCount taShareCount = new TaShareCount();
@@ -79,6 +78,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);
@@ -215,8 +215,8 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
     }
 
     @Override
-    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top) {
-        return taShareMapper.statTopShare(orgId, targetType, targetId, top);
+    public List<Map<String, Object>> statTopShare(Integer orgId, String targetType, String targetId, Integer top, String beginDate, String endDate) {
+        return taShareMapper.statTopShare(orgId, targetType, targetId, top, beginDate, endDate);
     }
 
     List<TaPerson> getPersonsByOpenId(String openid) {

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

@@ -44,6 +44,10 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
         }
 
+        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
+            buildingMapper.setFieldNum(id,"pv_num",1);
+        }
+
         TaPerson taPerson = persons.get(0);
 
         QueryWrapper<TaUv> queryWrapper = new QueryWrapper<>();
@@ -83,9 +87,6 @@ public class TaUvServiceImpl extends ServiceImpl<TaUvMapper, TaUv> implements IT
         if (typeOf.equals(CommConstant.FAVOR_CONSULTANT)) {
             taPersonMapper.setFieldIncrement(id,"hot_num", 1);
         }
-        if (typeOf.equals(CommConstant.FAVOR_PROJECT)) {
-            buildingMapper.setFieldNum(id,"pv_num",1);
-        }
 
         return ResponseBean.success("");
     }

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.entity.TdCity;
-import com.huiju.estateagents.mapper.TaOrgCityMapper;
 import com.huiju.estateagents.mapper.TdCityMapper;
 import com.huiju.estateagents.service.ITdCityService;
 import org.apache.commons.lang3.StringUtils;
@@ -91,6 +90,7 @@ public class TdCityServiceImpl extends ServiceImpl<TdCityMapper, TdCity> impleme
                         record.setDistrict(addressComponent.getString("district"));
                         record.setAddress(address);
                         record.setCreateTime(LocalDateTime.now());
+                        record.setOrgId(orgId);
                         Integer positionResult = taPersonService.savePersonPosition(record);
                         logger.info("保存用户位置信息返回：{}", positionResult);
                     } catch (Exception e) {

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

@@ -0,0 +1,41 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TsActivityDaily;
+import com.huiju.estateagents.excel.ActivityDailyExport;
+import com.huiju.estateagents.mapper.TsActivityDailyMapper;
+import com.huiju.estateagents.service.ITsActivityDailyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 活动统计  服务实现类
+ * </p>
+ *
+ * @author yansen
+ * @since 2020-04-20
+ */
+@Service
+public class TsActivityDailyServiceImpl extends ServiceImpl<TsActivityDailyMapper, TsActivityDaily> implements ITsActivityDailyService {
+    @Autowired
+    private TsActivityDailyMapper tsActivityDailyMapper;
+
+    @Override
+    public List<TsActivityDaily> getActivityDetail(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId, String targetName, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            asc = "statis_date";
+        }
+
+        return tsActivityDailyMapper.getActivityDetail(orgId, startDate, endDate, buildingId, targetType, targetId, targetName, asc, desc);
+    }
+
+    @Override
+    public List<ActivityDailyExport> getActivityExport(Integer orgId, String startDate, String endDate, String buildingId, String targetType, String targetId) {
+        return tsActivityDailyMapper.getActivityExport(orgId, startDate, endDate, buildingId, targetType, targetId);
+    }
+}

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

@@ -0,0 +1,159 @@
+package com.huiju.estateagents.service.impl;
+
+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.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.excel.ConsultantKPIExport;
+import com.huiju.estateagents.mapper.TaPersonMapper;
+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.ArrayList;
+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
+    TaUserMapper taUserMapper;
+
+    @Autowired
+    TaRecommendCustomerMapper taRecommendCustomerMapper;
+    
+    @Autowired
+    private TaPersonMapper taPersonMapper;
+
+    /**
+     * 获取用户授权楼盘
+     * 如果 buildingId 参数存在, 则校验参数是否在授权范围内
+     *
+     * @param userId
+     * @param buildingId
+     * @return List 长度 0 代表未授权楼盘, null 代表管理员, 不校验楼盘授权
+     */
+    public List<String> getBuildingListOf(Integer userId, String buildingId) {
+        List<String> unAuthrized = new ArrayList<String>() {{
+            add("*");   // 构造SQL  building_id in ('*') , 目的是为了阻止检索到数据
+        }};
+
+        TaUser taUser = taUserMapper.selectById(userId);
+        if (taUser == null) {
+            return unAuthrized;
+        }
+
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
+            if (!StringUtils.isEmpty(buildingId)) {
+                return new ArrayList<String>() {{
+                    add(buildingId);
+                }};
+            }
+            return null;
+        }
+
+        List<String> buildings = taUserMapper.getBuildingIdsOf(userId, buildingId);
+        return null == buildings || buildings.size() == 0 ? unAuthrized : buildings;
+    }
+
+    @Override
+    public IPage<TsConsultantKpi> stsKPIDaily(Integer pageNum, Integer pageSize, Integer orgId, Integer userId, String buildingId, String startDate, String endDate, String asc, String desc) {
+        if (StringUtils.isEmpty(asc) && StringUtils.isEmpty(desc)) {
+            desc = "new_persons";
+        }
+
+        List<String> buildingIds = getBuildingListOf(userId, buildingId);
+        IPage<TsConsultantKpi> page = new Page<>(pageNum, pageSize);
+        return tsConsultantKpiMapper.stsKPIDaily(page, orgId, buildingIds, startDate, endDate, asc, desc);
+    }
+
+    @Override
+    public TsConsultantKpi stsKPITotalByOrg(Integer orgId, Integer userId, String buildingId, String startDate, String endDate) {
+        List<String> buildingIds = getBuildingListOf(userId, buildingId);
+
+        // 合计数据, 但是不包含 客户总计 列
+        TsConsultantKpi result = tsConsultantKpiMapper.stsKPITotalByOrg(orgId, buildingIds, startDate, endDate);
+
+        // 统计当前时间段内的已经固化的置业的客户
+        Integer totalPersons = tsConsultantKpiMapper.stsAllCustomersByOrg(orgId, buildingIds, startDate, endDate);
+        result.setTotalPersons(totalPersons);
+
+        return result;
+    }
+
+    @Override
+    public List<ConsultantKPIExport> stsKPIDailyExport(Integer orgId, Integer userId, String buildingId, String startDate, String endDate) {
+        List<String> buildingIds = getBuildingListOf(userId, buildingId);
+        return tsConsultantKpiMapper.stsKPIDailyExport(orgId, buildingIds, startDate, endDate);
+    }
+
+    @Override
+    public IPage<TaRecommendCustomer> getCustomerListOfConsultant(IPage<TaRecommendCustomer> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        String personId = null;
+        TaPerson taPerson = taPersonMapper.selectOne(new QueryWrapper<TaPerson>().eq("user_id", userId).eq("org_id", orgId));
+        if (null != taPerson){
+            personId = taPerson.getPersonId();
+        }
+        return taRecommendCustomerMapper.getCustomerListOfConsultant(page, orgId, userId, buildingId, startDate, endDate, personId);
+    }
+
+    @Override
+    public IPage<TaPerson> getConsultantShareCustomers(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
+        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) {
+        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) {
+        return tsConsultantKpiMapper.getConsultantShareTimes(page, orgId, userId, buildingId, startDate, endDate, targetType, targetName, userName, personId);
+    }
+
+}

src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java

@@ -0,0 +1,373 @@
+package com.huiju.estateagents.statistic.controller;
+
+import com.alibaba.excel.EasyExcel;
+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.excel.ActivityStatistics.*;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
+import com.huiju.estateagents.statistic.service.impl.TaActivityStaticServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@RestController
+@RequestMapping("/api")
+public class ActivityStatisticController extends BaseController {
+
+    @Autowired
+    private TaActivityStaticServiceImpl taActivityStaticService;
+
+    @GetMapping(value = "/admin/activityStatistical/total")
+    public ResponseBean indexStatistical(@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 = "buildingId", required = false)String buildingId,
+                                         @RequestParam(value = "targetType", required = false)String targetType,
+                                         HttpServletRequest request) {
+        return taActivityStaticService.activityStatistical(startDate, endDate, buildingId, targetType, getOrgId(request), getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 活动趋势人数
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectAllActivityUser")
+    public ResponseBean selectNewsUserCount(@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 = "buildingId", required = false)String buildingId,
+                                            @RequestParam(value = "targetType", required = false)String targetType,
+                                            HttpServletRequest request) {
+        return taActivityStaticService.selectAllActivityUser(getOrgId(request), startDate, endDate, buildingId, targetType, getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 活动表格统计人数
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectTableData")
+    public ResponseBean selectTableData(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                            @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 = "buildingId", required = false)String buildingId,
+                                            @RequestParam(value = "targetType", required = false)String targetType,
+                                            @RequestParam(value = "sort", required = false)String sort,
+                                            @RequestParam(value = "colKey", required = false)String colKey,
+                                            HttpServletRequest request) {
+        return taActivityStaticService.selectTableData(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 活动表格统计人数导出
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/tableDataExport")
+    public void selectTableDataExport(@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 = "buildingId", required = false)String buildingId,
+                                        @RequestParam(value = "targetType", required = false)String targetType,
+                                        @RequestParam(value = "sort", required = false)String sort,
+                                        @RequestParam(value = "colKey", required = false)String colKey,
+                                        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(), StatisicAttractUser.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<StatisicAttractUser> data = taActivityStaticService.selectExportTableData(getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 活动表格统计人数
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/activityStatisDetail")
+    public ResponseBean selectActivityStatisDetail(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                        @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 = "buildingId", required = false)String buildingId,
+                                        @RequestParam(value = "targetType", required = false)String targetType,
+                                        @RequestParam(value = "activityName", required = false)String activityName,
+                                        @RequestParam(value = "sort", required = false)String sort,
+                                        @RequestParam(value = "colKey", required = false)String colKey,
+                                        HttpServletRequest request) {
+        return taActivityStaticService.selectActivityStatisDetail(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 活动表格统计人数导出
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/activityDetailTableDataExport")
+    public void activityDetailTableDataExport(@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 = "buildingId", required = false)String buildingId,
+                                @RequestParam(value = "targetType", required = false)String targetType,
+                                @RequestParam(value = "activityName", required = false)String activityName,
+                                @RequestParam(value = "sort", required = false)String sort,
+                                @RequestParam(value = "colKey", required = false)String colKey,
+                                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(), ActivityDetailShareRecord.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<ActivityDetailShareRecord> data = taActivityStaticService.selectActivityStatisDetailExport(getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 分享人数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivitySharePersonNum")
+    public ResponseBean selectActivitySharePersonNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                   @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 = "sharePersonType", required = false)String sharePersonType,
+                                                   @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
+                                                   @RequestParam(value = "sharePersonPhone", required = false)String sharePersonPhone,
+                                                   @RequestParam(value = "activityId", required = false)String activityId,
+                                                   @RequestParam(value = "activityType", required = false)String activityType,
+                                                   @RequestParam(value = "sort", required = false)String sort,
+                                                   @RequestParam(value = "colKey", required = false)String colKey,
+                                                   @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                   HttpServletRequest request) {
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePersonPhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 分享人数统计导出
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/activitySharePersonNumExport")
+    public void selectActivitySharePersonNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                             @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 = "sharePersonType", required = false)String sharePersonType,
+                                             @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
+                                             @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                             @RequestParam(value = "activityId", required = false)String activityId,
+                                             @RequestParam(value = "activityType", required = false)String activityType,
+                                             @RequestParam(value = "sort", required = false)String sort,
+                                             @RequestParam(value = "colKey", required = false)String colKey,
+                                             @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(), SharePersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 分享次数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityShareNum")
+    public ResponseBean selectActivityShareNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                     @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 = "sharePersonType", required = false)String sharePersonType,
+                                                     @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
+                                                     @RequestParam(value = "sharePersonPhone", required = false)String sharePersonPhone,
+                                                     @RequestParam(value = "activityId", required = false)String activityId,
+                                                     @RequestParam(value = "activityType", required = false)String activityType,
+                                                     @RequestParam(value = "personId", required = false)String personId,
+                                                     @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                     @RequestParam(value = "sort", required = false)String sort,
+                                                     @RequestParam(value = "colKey", required = false)String colKey,
+                                                     HttpServletRequest request) {
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePersonPhone, activityId, activityType, personId, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 分享次数统计导出
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityShareNumExport")
+    public void selectActivityShareNumExport(@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 = "sharePersonType", required = false)String sharePersonType,
+                                             @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
+                                             @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                             @RequestParam(value = "activityId", required = false)String activityId,
+                                             @RequestParam(value = "activityType", required = false)String activityType,
+                                             @RequestParam(value = "personId", required = false)String personId,
+                                             @RequestParam(value = "buildingId", required = false)String buildingId,
+                                             @RequestParam(value = "sort", required = false)String sort,
+                                             @RequestParam(value = "colKey", required = false)String colKey,
+                                             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(), ShareNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 注册人数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityAddRegistNum")
+    public ResponseBean selectActivityAddRegistNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                               @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 = "personFrom", required = false)String personFrom,
+                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                               @RequestParam(value = "activityType", required = false)String activityType,
+                                               @RequestParam(value = "buildingId", required = false)String buildingId,
+                                               @RequestParam(value = "province", required = false)String province,
+                                               HttpServletRequest request) {
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
+    }
+
+    /**
+     * 注册人数导出
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityAddRegistNumExport")
+    public void selectActivityAddRegistNumExport(@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 = "personFrom", required = false)String personFrom,
+                                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                                               @RequestParam(value = "activityType", required = false)String activityType,
+                                                               @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                               @RequestParam(value = "province", required = false)String province,
+                                                               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(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 访问次数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitNum")
+    public ResponseBean selectActivityVisitNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                                   @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 = "personFrom", required = false)String personFrom,
+                                                   @RequestParam(value = "province", required = false)String province,
+                                                   @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                                   @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                                   @RequestParam(value = "activityId", required = false)String activityId,
+                                                   @RequestParam(value = "activityType", required = false)String activityType,
+                                                   @RequestParam(value = "personId", required = false)String personId,
+                                                   @RequestParam(value = "buildingId", required = false)String buildingId,
+                                                   HttpServletRequest request) {
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId);
+    }
+
+    /**
+     * 访问次数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitNumExport")
+    public void selectActivityVisitNum(@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 = "personFrom", required = false)String personFrom,
+                                               @RequestParam(value = "province", required = false)String province,
+                                               @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                               @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                               @RequestParam(value = "activityType", required = false)String activityType,
+                                               @RequestParam(value = "personId", required = false)String personId,
+                                               @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(), VisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<VisitNum> data = taActivityStaticService.selectActivityVisitNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 访问人数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitPersonNum")
+    public ResponseBean selectActivityVisitPersonNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                               @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 = "personFrom", required = false)String personFrom,
+                                               @RequestParam(value = "province", required = false)String province,
+                                               @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                               @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                               @RequestParam(value = "personId", required = false)String personId,
+                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                               @RequestParam(value = "activityType", required = false)String activityType,
+                                               @RequestParam(value = "buildingId", required = false)String buildingId,
+                                               HttpServletRequest request) {
+        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
+    }
+
+    /**
+     * 访问人数统计导出
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitPersonNumExport")
+    public void selectActivityVisitPersonNumExport(@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 = "personFrom", required = false)String personFrom,
+                                       @RequestParam(value = "province", required = false)String province,
+                                       @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                       @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                       @RequestParam(value = "personId", required = false)String personId,
+                                       @RequestParam(value = "activityId", required = false)String activityId,
+                                       @RequestParam(value = "activityType", required = false)String activityType,
+                                       @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(), VisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+}

src/main/java/com/huiju/estateagents/statistic/entity/TaActivityStatistic.java

@@ -0,0 +1,19 @@
+package com.huiju.estateagents.statistic.entity;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDateTime;
+
+@Data
+public class TaActivityStatistic {
+
+    private String buildingId;
+
+    private String targetType;
+
+    private LocalDateTime startDate;
+
+    private LocalDateTime endDate;
+
+}

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

@@ -0,0 +1,328 @@
+package com.huiju.estateagents.statistic.mapper;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.ActivityStatistics.*;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Mapper
+public interface TaActicityStaticMapper {
+
+    Integer selectSharePersonNum(
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("buildingId") String buildingId,
+            @Param("targetType") String targetType,
+            @Param("orgId") Integer orgId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId);
+
+    Integer selectShareNum(@Param("startDate") LocalDateTime startDate,
+                           @Param("endDate") LocalDateTime endDate,
+                           @Param("buildingId") String buildingId,
+                           @Param("targetType") String targetType,
+                           @Param("orgId") Integer orgId,
+                           @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                           @Param("userId") Integer userId);
+
+    Integer selectVisitPersonNum(@Param("startDate") LocalDateTime startDate,
+                                 @Param("endDate") LocalDateTime endDate,
+                                 @Param("buildingId") String buildingId,
+                                 @Param("targetType") String targetType,
+                                 @Param("orgId") Integer orgId,
+                                 @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                                 @Param("userId") Integer userId);
+
+    Integer selectVisitNum(@Param("startDate") LocalDateTime startDate,
+                           @Param("endDate") LocalDateTime endDate,
+                           @Param("buildingId") String buildingId,
+                           @Param("targetType") String targetType,
+                           @Param("orgId") Integer orgId,
+                           @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                           @Param("userId") Integer userId);
+
+    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId,
+                                               @Param("startDate") LocalDateTime startDate,
+                                               @Param("endDate") LocalDateTime endDate,
+                                               @Param("buildingId") String buildingId,
+                                               @Param("targetType") String targetType,
+                                               @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                                               @Param("userId") Integer userId );
+
+    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId,
+                                                     @Param("startDate") LocalDateTime startDate,
+                                                     @Param("endDate") LocalDateTime endDate,
+                                                     @Param("buildingId") String buildingId,
+                                                     @Param("targetType") String targetType,
+                                                     @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                                                     @Param("userId") Integer userId);
+
+    List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId,
+                                               @Param("startDate") LocalDateTime startDate,
+                                               @Param("endDate") LocalDateTime endDate,
+                                               @Param("buildingId") String buildingId,
+                                               @Param("targetType") String targetType,
+                                               @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    List<Map<String, Object>> selectVisitPersonCount(@Param("orgId") Integer orgId,
+                                                     @Param("startDate") LocalDateTime startDate,
+                                                     @Param("endDate") LocalDateTime endDate,
+                                                     @Param("buildingId") String buildingId,
+                                                     @Param("targetType") String targetType,
+                                                     @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    List<Map<String, Object>> selectAddRegistCount(@Param("orgId") Integer orgId,
+                                                   @Param("startDate") LocalDateTime startDate,
+                                                   @Param("endDate") LocalDateTime endDate,
+                                                   @Param("buildingId") String buildingId,
+                                                   @Param("targetType") String targetType,
+                                                   @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
+
+    IPage<StatisicAttractUser> selectTableData(
+            IPage<StatisicAttractUser> attractUserIPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("buildingId") String buildingId,
+            @Param("targetType") String targetType,
+            @Param("sortType") String sortType,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId );
+
+    List<StatisicAttractUser> selectExportTableData(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("buildingId") String buildingId,
+            @Param("targetType") String targetType,
+            @Param("sortType") String sortType,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId );
+
+    IPage<ActivityDetailShareRecord> selectActivityStatisDetail(
+            IPage<ActivityDetailShareRecord> attractUserIPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("buildingId") String buildingId,
+            @Param("targetType") String targetType,
+            @Param("activityName") String activityName,
+            @Param("sortType") String sortType,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    List<ActivityDetailShareRecord> selectActivityStatisDetailExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDate startDate,
+            @Param("endDate") LocalDate endDate,
+            @Param("buildingId") String buildingId,
+            @Param("targetType") String targetType,
+            @Param("activityName") String activityName,
+            @Param("sortType") String sortType,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    IPage<SharePersonNum> selectActivitySharePersonNum(
+            IPage<SharePersonNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("sharePersonType") String sharePersonType,
+            @Param("sharePersonName") String sharePersonName,
+            @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
+            @Param("sort") String sort,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    List<SharePersonNum> selectActivitySharePersonNumExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("sharePersonType") String sharePersonType,
+            @Param("sharePersonName") String sharePersonName,
+            @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
+            @Param("sort") String sort,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    IPage<ShareNum> selectActivityShareNum(
+            IPage<ShareNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("sharePersonType") String sharePersonType,
+            @Param("sharePersonName") String sharePersonName,
+            @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("personId") String personId,
+            @Param("buildingId") String buildingId,
+            @Param("sort") String sort,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    List<ShareNum> selectActivityShareNumExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("sharePersonType") String sharePersonType,
+            @Param("sharePersonName") String sharePersonName,
+            @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("personId") String personId,
+            @Param("buildingId") String buildingId,
+            @Param("sort") String sort,
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    IPage<AddRegistNum> selectActivityAddRegistNum(
+            IPage<AddRegistNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
+            @Param("province") String province,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    List<AddRegistNum> selectActivityAddRegistNumExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
+            @Param("province") String province,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
+    );
+
+    IPage<VisitNum> selectActivityVisitNum(
+            IPage<VisitNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitNum> selectActivityVisitNumExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    IPage<VisitPersonNum> selectActivityVisitPersonNum(
+            IPage<VisitPersonNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitPersonNum> selectActivityVisitPersonNumExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
+            IPage<VisitPersonNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitPersonNum> selectActivityVisitPersonNumExportByPersonId(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    IPage<VisitNum> selectActivityVisitNumByPersonId(
+            IPage<VisitNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+    List<VisitNum> selectActivityVisitNumExportByPersonId(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId
+    );
+
+}

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/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -0,0 +1,198 @@
+package com.huiju.estateagents.statistic.service.impl;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.ActivityStatistics.*;
+import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Service
+public class TaActivityStaticServiceImpl {
+    @Autowired
+    private TaActicityStaticMapper taActicityStaticMapper;
+
+    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+
+        ResponseBean responseBean = new ResponseBean();
+        Map<String, Object> map = new HashMap<>();
+
+        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
+
+        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
+
+        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
+
+        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
+
+        map.put("sharePersonNum", sharePersonNum);
+        map.put("shareNum", shareNum);
+        map.put("visitPersonNum", visitPersonNum);
+        map.put("visitNum", visitNum);
+
+        responseBean.addSuccess(map);
+
+        return responseBean;
+    }
+
+    public ResponseBean selectAllActivityUser(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        ResponseBean responseBean = new ResponseBean();
+
+        // 新增用户数
+        List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
+        List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
+        List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings);
+        List<Map<String, Object>> selectVisitPersonCount = taActicityStaticMapper.selectVisitPersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings);
+        List<Map<String, Object>> selectAddRegistCount = taActicityStaticMapper.selectAddRegistCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings);
+
+
+        for (Map<String, Object> ssc : selectShareCount){
+            //如果时间相等，那么原来子查询的数据塞到统一的数据处理map中
+            for (Map<String, Object> sspc : selectSharePersonCount){
+                if (sspc.get("date").equals(ssc.get("date"))){
+                    ssc.put("sharePersonCount", sspc.get("sharePersonCount"));
+                }
+                continue;
+            }
+            for (Map<String, Object> svc : selectVisitCount){
+                if (svc.get("date").equals(ssc.get("date"))){
+                    ssc.put("visitCount", svc.get("visitCount"));
+                }
+                continue;
+            }
+            for (Map<String, Object> svpc : selectVisitPersonCount){
+                if (svpc.get("date").equals(ssc.get("date"))){
+                    ssc.put("visitPersonCount", svpc.get("visitPersonCount"));
+                }
+                continue;
+            }
+            for (Map<String, Object> sarc : selectAddRegistCount){
+                if (sarc.get("date").equals(ssc.get("date"))){
+                    ssc.put("addregistCount", sarc.get("addregistCount"));
+                }
+                continue;
+            }
+        }
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectAllActivityUser", selectShareCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    public ResponseBean selectTableData(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        IPage<StatisicAttractUser> iPage = new Page<>(pageNum, pageSize);
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey, taPersonBuildings, userId);
+        return ResponseBean.success(data);
+    }
+
+    public List<StatisicAttractUser> selectExportTableData(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+        return taActicityStaticMapper.selectExportTableData(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey, taPersonBuildings, userId);
+    }
+
+    public ResponseBean selectActivityStatisDetail(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        IPage<ActivityDetailShareRecord> iPage = new Page<>(pageNum, pageSize);
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, activityName, sortType, colKey, taPersonBuildings, userId);
+        return ResponseBean.success(data);
+    }
+
+    public List<ActivityDetailShareRecord> selectActivityStatisDetailExport(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+        return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey, taPersonBuildings, userId);
+    }
+
+    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        IPage<SharePersonNum> iPage = new Page<>(pageNum, pageSize);
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+
+        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey, taPersonBuildings, userId);
+        return ResponseBean.success(data);
+    }
+
+    public List<SharePersonNum> selectActivitySharePersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey, taPersonBuildings, userId);
+    }
+
+    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        IPage<ShareNum> iPage = new Page<>(pageNum, pageSize);
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+
+        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
+        return ResponseBean.success(data);
+    }
+
+    public List<ShareNum> selectActivityShareNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        String sortType = "ascend".equals(sort) ? "asc" : "desc";
+        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
+    }
+
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
+        return ResponseBean.success(data);
+    }
+
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
+    }
+
+    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){
+        IPage<VisitNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<VisitNum> data;
+        if (StringUtils.isEmpty(personId)){
+            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+        }else{
+            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+        }
+
+        return ResponseBean.success(data);
+    }
+
+    public List<VisitNum> selectActivityVisitNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){
+        List<VisitNum> list = new ArrayList<>();
+        if (StringUtils.isEmpty(personId)){
+            list = taActicityStaticMapper.selectActivityVisitNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+        }else{
+            list = taActicityStaticMapper.selectActivityVisitNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+        }
+        return list;
+    }
+
+    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+        IPage<VisitPersonNum> iPage = new Page<>(pageNum, pageSize);
+        IPage<VisitPersonNum> data;
+        if (StringUtils.isEmpty(personId)){
+            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+        }else{
+            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+        }
+
+        return ResponseBean.success(data);
+    }
+
+    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+        List<VisitPersonNum> list = new ArrayList<>();
+        if (StringUtils.isEmpty(personId)){
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+        }else{
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+        }
+        return list;
+    }
+
+}

src/main/java/com/huiju/estateagents/third/controller/TaThirdPartyMiniappConfigController.java

@@ -224,7 +224,9 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
     public ResponseBean genQRcode(
             @RequestParam (required = false) String h5Id,
             @RequestParam (required = false) String personId,
-            @RequestParam (required = false, defaultValue = "10") Integer top
+            @RequestParam (required = false, defaultValue = "10") Integer top,
+            @RequestParam (required = false) String beginDate,
+            @RequestParam (required = false) String endDate
     ) {
         // 暂时没有任何校验
         QueryWrapper<TaThirdPartyMiniappConfig> queryWrapper = new QueryWrapper<>();
@@ -234,7 +236,7 @@ public class TaThirdPartyMiniappConfigController extends BaseController {
 
         TaThirdPartyMiniappConfig taThirdPartyMiniappConfig = iTaThirdPartyMiniappConfigService.getOne(queryWrapper);
 
-        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top);
+        List<Map<String, Object>> res = taShareService.statTopShare(taThirdPartyMiniappConfig.getOrgId(), "h5_share", h5Id, top, beginDate, endDate);
         return ResponseBean.success(res);
     }
 }

src/main/resources/mapper/ActivityManageMapper.xml

@@ -0,0 +1,168 @@
+<?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.ActivityManageMapper">
+
+    <select id = "getStatisticDataByType" resultType="com.huiju.estateagents.bo.request.ActivityStatisticResponseBO">
+      select
+        -- 活动分享人数
+        (SELECT count(DISTINCT b.person_id) FROM ta_share_count b
+        WHERE b.org_id = a.org_id
+            <choose>
+                <when test=" type == 'live'">
+                    AND b.tagert_type like concat('%',a.target_type,'%')
+                </when>
+                <otherwise>
+                    AND b.tagert_type = a.target_type
+                </otherwise>
+            </choose>
+            AND b.be_share = a.target_id
+        ) as share_persons,
+
+        -- 活动分享次数
+        (SELECT count(*) FROM ta_share_count c
+        WHERE c.org_id = a.org_id
+            <choose>
+                <when test=" type == 'live'">
+                    AND c.tagert_type like concat('%',a.target_type,'%')
+                </when>
+                <otherwise>
+                    AND c.tagert_type = a.target_type
+                </otherwise>
+            </choose>
+            AND c.be_share = a.target_id
+        ) as share_num,
+
+        -- 活动访问人数
+        (select count( DISTINCT d.person_id ) from ta_person_visit_record d
+        WHERE d.org_id = a.org_id
+            AND if(d.target_type is null ,d.event_type = a.target_type, d.target_type = REPLACE(a.target_type, 'activity', 'dynamic'))
+            AND d.target_id = a.target_id
+            AND d.`event` = 'detail'
+        ) as visit_persons,
+
+        -- 活动访问次数
+        (select count(*) from ta_person_visit_record e
+        WHERE e.org_id = a.org_id
+            AND if(e.target_type is null ,e.event_type = a.target_type, e.target_type = REPLACE(a.target_type, 'activity', 'dynamic'))
+            AND e.target_id = a.target_id
+            AND e.`event` = 'detail'
+        ) as visit_num,
+
+        -- 分享新增用户
+        (select count(*) from ta_share_person_from f
+        where	f.org_id = a.org_id
+        <choose>
+            <when test=" type == 'live'">
+                AND f.target_type = concat('%',REPLACE(a.target_type, 'activity', 'dynamic'), '_share%')
+            </when>
+            <otherwise>
+                AND f.target_type = concat(REPLACE(a.target_type, 'activity', 'dynamic'), '_share')
+            </otherwise>
+        </choose>
+        AND f.target_id = a.target_id
+        AND f.`status` > 0
+        AND f.is_first_time = 1
+        ) as new_persons,
+
+        -- 分享新增客户
+        (select count(*) from ta_share_person_from g
+        inner join ta_person h on h.person_id = g.person_id
+        where	g.org_id = a.org_id
+        <choose>
+            <when test=" type == 'live'">
+                AND g.target_type = concat('%',REPLACE(a.target_type, 'activity', 'dynamic'), '_share%')
+            </when>
+            <otherwise>
+                AND g.target_type = concat(REPLACE(a.target_type, 'activity', 'dynamic'), '_share')
+            </otherwise>
+        </choose>
+        AND g.target_id = a.target_id
+        AND g.`status` > 0
+        AND g.is_first_time = 1
+        AND h.phone is not null
+        ) as new_customers
+
+        from (
+            <if test=" type == 'activity' ">
+                SELECT
+                    t.org_id,
+                    t.building_id,
+                    s.building_name,
+                    t.dynamic_id AS target_id,
+                    t.title AS target_name,
+                    'activity' AS target_type
+                FROM
+                    ta_building_dynamic t
+                LEFT JOIN ta_building s ON s.building_id = t.building_id
+                WHERE
+                   t.dynamic_id = #{id}
+                  AND t.org_id = #{orgId}
+            </if>
+
+            <if test=" type == 'h5' " >
+                    SELECT
+                    t.org_id,
+                    t.building_id,
+                    s.building_name,
+                    t.drainage_id AS target_id,
+                    t.`name` AS target_name,
+                    'h5' AS target_type
+                FROM
+                  ta_drainage t
+                LEFT JOIN ta_building s ON s.building_id = t.building_id
+                WHERE
+                  t.drainage_id = #{id}
+                  AND t.org_id = #{orgId}
+            </if>
+
+            <if test=" type == 'help' ">
+                SELECT
+                    t.org_id,
+                    t.building_id,
+                    s.building_name,
+                    t.help_activity_id AS target_id,
+                    t.title AS target_name,
+                    'help' AS target_type
+                FROM
+                    ta_help_activity t
+                LEFT JOIN ta_building s ON s.building_id = t.building_id
+                WHERE
+                    t.help_activity_id = #{id}
+                    AND t.org_id = #{orgId}
+            </if>
+
+            <if test=" type == 'group' ">
+                SELECT
+                    t.org_id,
+                    t.building_id,
+                    s.building_name,
+                    t.group_activity_id AS target_id,
+                    t.activity_name AS target_name,
+                    'group' AS target_type
+                FROM
+                    ta_share_activity t
+                LEFT JOIN ta_building s ON s.building_id = t.building_id
+                WHERE
+                    t.group_activity_id = #{id}
+                    AND t.org_id = #{orgId}
+            </if>
+
+            <if test=" type == 'live' ">
+                SELECT
+                    t.org_id,
+                    t.building_id,
+                    s.building_name,
+                    t.live_activity_id AS target_id,
+                    t.live_activity_title AS target_name,
+                    'live' AS target_type
+                FROM
+                    ta_live_activity t
+                LEFT JOIN ta_building s ON s.building_id = t.building_id
+                WHERE
+                    t.live_activity_id = #{id}
+                    AND t.org_id = #{orgId}
+            </if>
+        ) a
+    </select>
+
+</mapper>

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -190,5 +190,4 @@
         from ta_building_dynamic
         where org_id = #{orgId}
     </select>
-
 </mapper>

src/main/resources/mapper/TaBuildingMapper.xml

@@ -237,6 +237,7 @@
 
     <select id="selectMainBuildings" resultType="com.huiju.estateagents.entity.TaBuilding">
         SELECT
+            CONCAT( c.`name`, t.building_area  ) AS building_area,
             t.*,
             s.url AS list_poster,
             GROUP_CONCAT( m.tag_name ) AS tags
@@ -245,6 +246,7 @@
         LEFT JOIN ta_building_img s ON t.building_id = s.building_id
         AND s.img_type = 'list'
         LEFT JOIN ta_building_tag m ON t.building_id = m.building_id
+        LEFT JOIN td_city c ON t.city_id = c.id
         WHERE
             t.org_id = #{orgId}
         <if test="cityId != null and cityId != ''">
@@ -257,4 +259,490 @@
         ORDER BY t.order_no desc
     </select>
 
+    <select id="getGkBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS gk_num,
+            bb.building_id,
+            bb.create_date,
+            bb.building_name
+        FROM
+        (
+            SELECT
+                b.*,
+                d.building_name
+            FROM
+                ta_person b
+            LEFT JOIN ta_building d ON b.building_id = d.building_id
+            WHERE
+                b.STATUS > 0
+                AND b.org_id = #{orgId}
+                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+                <if test="personBuildingList != null and personBuildingList.size > 0">
+                    AND b.building_id in
+                    <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                        #{personBuilding.buildingId}
+                    </foreach>
+                </if>
+                <if test="startDate != null">
+                    and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+                and b.building_id is not null
+            GROUP BY
+            b.person_id
+        ) bb
+        GROUP BY
+            bb.building_id
+        order by gk_num desc
+        limit 6
+    </select>
+
+    <select id="getSkBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS sk_num,
+            a.building_id,
+            d.building_name
+        FROM
+            ta_recommend_customer a
+        LEFT JOIN ta_building d ON a.building_id = d.building_id
+        WHERE
+            a.STATUS > 0
+            AND a.verify_status = 1
+            AND a.realty_consultant IS NOT NULL
+            AND a.realty_consultant != ''
+            AND a.org_id = #{orgId}
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            <if test="startDate != null">
+                and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
+        GROUP BY
+        a.building_id
+        ORDER BY
+        sk_num DESC
+        LIMIT 6
+    </select>
+
+    <select id="getWgBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS wg_num,
+            a.be_uv AS building_id,
+            a.create_date,
+            d.building_name
+        FROM
+            ta_uv a
+        LEFT JOIN ta_building d ON a.be_uv = d.building_id
+        LEFT JOIN ta_person p ON a.person_id = p.person_id
+        WHERE
+            a.tagert_type = 'project'
+            and p.org_id = #{orgId}
+            and a.be_uv != "undefined"
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.be_uv in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            <if test="startDate != null">
+                and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
+        GROUP BY
+            a.be_uv
+        ORDER BY
+            wg_num DESC
+        LIMIT 6
+    </select>
+
+    <select id="getFwBarData" resultType="java.util.Map">
+        SELECT
+            t.pv_num,
+            t.building_id,
+            t.building_name
+        FROM
+            ta_building t
+        WHERE
+            t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        ORDER BY
+        pv_num DESC
+        LIMIT 6
+    </select>
+
+    <select id="getStatsTableList" resultType="com.huiju.estateagents.excel.StatsBuilding">
+        SELECT
+            t.building_id,
+            t.building_name,
+            IFNULL( t.pv_num, 0 ) AS pv_num,
+            IFNULL( uu.uv_num, 0 ) AS uv_num,
+            IFNULL( aa.sk_num, 0 ) AS sk_num,
+            IFNULL( bbb.gk_num, 0 ) AS gk_num,
+            IFNULL( aa.sk_num, 0 ) + IFNULL( bbb.gk_num, 0 ) AS kh_num
+        FROM
+            ta_building t
+        LEFT JOIN (
+            SELECT
+                count( * ) AS sk_num,
+                a.building_id
+            FROM
+                ta_recommend_customer a
+            WHERE
+                a.STATUS > 0
+                AND a.verify_status = 1
+                AND a.realty_consultant IS NOT NULL
+                AND a.realty_consultant != ''
+                AND a.org_id = #{orgId}
+                <if test="startDate != null">
+                    and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                a.building_id
+        ) aa ON aa.building_id = t.building_id
+        LEFT JOIN (
+            SELECT
+                count( * ) AS gk_num,
+                bb.building_id
+            FROM
+            (
+                SELECT
+                    b.*
+                FROM
+                    ta_person b
+                WHERE
+                    b.STATUS > 0
+                    AND b.org_id = #{orgId}
+                    AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                    AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+                    <if test="startDate != null">
+                        and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                    </if>
+                    <if test="endDate != null">
+                        and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                    </if>
+                GROUP BY
+                    b.person_id
+            ) bb
+            GROUP BY
+                bb.building_id
+        ) bbb ON bbb.building_id = t.building_id
+        LEFT JOIN (
+            SELECT
+                count( * ) AS uv_num,
+                u.be_uv AS building_id
+            FROM
+                ta_uv u
+            LEFT JOIN ta_person p ON u.person_id = p.person_id
+        WHERE
+                u.tagert_type = 'project'
+                AND p.org_id = #{orgId}
+            <if test="startDate != null">
+                and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
+            GROUP BY
+                u.be_uv
+        ) uu ON uu.building_id = t.building_id
+        WHERE
+        t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != '' ">
+            AND t.building_id = #{buildingId}
+        </if>
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
+    </select>
+    <select id="getExportTableList" resultType="com.huiju.estateagents.excel.StatsBuilding">
+        SELECT
+        t.building_id,
+        t.building_name,
+        IFNULL( t.pv_num, 0 ) AS pv_num,
+        IFNULL( uu.uv_num, 0 ) AS uv_num,
+        IFNULL( aa.sk_num, 0 ) AS sk_num,
+        IFNULL( bbb.gk_num, 0 ) AS gk_num,
+        IFNULL( aa.sk_num, 0 ) + IFNULL( bbb.gk_num, 0 ) AS kh_num
+        FROM
+        ta_building t
+        LEFT JOIN (
+        SELECT
+        count( * ) AS sk_num,
+        a.building_id
+        FROM
+        ta_recommend_customer a
+        WHERE
+        a.STATUS > 0
+        AND a.verify_status = 1
+        AND a.realty_consultant IS NOT NULL
+        AND a.realty_consultant != ''
+        AND a.org_id = #{orgId}
+        <if test="startDate != null">
+            and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        a.building_id
+        ) aa ON aa.building_id = t.building_id
+        LEFT JOIN (
+        SELECT
+        count( * ) AS gk_num,
+        bb.building_id
+        FROM
+        (
+        SELECT
+        b.*
+        FROM
+        ta_person b
+        WHERE
+        b.STATUS > 0
+        AND b.org_id = #{orgId}
+        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+        <if test="startDate != null">
+            and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        b.person_id
+        ) bb
+        GROUP BY
+        bb.building_id
+        ) bbb ON bbb.building_id = t.building_id
+        LEFT JOIN (
+        SELECT
+        count( * ) AS uv_num,
+        u.be_uv AS building_id
+        FROM
+        ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
+        WHERE
+        u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
+        <if test="startDate != null">
+            and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        u.be_uv
+        ) uu ON uu.building_id = t.building_id
+        WHERE
+        t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != '' ">
+            AND t.building_id = #{buildingId}
+        </if>
+    </select>
+    <select id="getStatsTimeBarList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
+        SELECT
+            #{buildingName} as building_name,
+            t.date as create_date,
+            IFNULL( s.sk_num, 0 ) AS sk_num,
+            IFNULL( g.gk_num, 0 ) AS gk_num,
+            IFNULL( u.uv_num, 0 ) AS uv_num,
+            IFNULL( s.sk_num, 0 ) + IFNULL( g.gk_num, 0 ) AS kh_num
+        FROM
+        (
+            SELECT
+            DATE_FORMAT( DATE_SUB( #{endDate}, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            FROM
+            sequence a
+            WHERE
+            a.rownum &lt;= datediff( #{endDate}, #{startDate} )
+        ) t
+        LEFT JOIN (
+            SELECT
+                count( * ) AS sk_num,
+                a.building_id,
+                DATE_FORMAT( a.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_recommend_customer a
+            WHERE
+                a.STATUS > 0
+                AND a.verify_status = 1
+                AND a.realty_consultant IS NOT NULL
+                AND a.realty_consultant != ''
+                AND a.org_id = #{orgId}
+                AND a.building_id = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                DATE_FORMAT( a.create_date, '%Y-%m-%d' )
+        ) s ON t.date = s.create_date
+        LEFT JOIN (
+            SELECT
+                count( * ) AS gk_num,
+                b.building_id,
+                DATE_FORMAT( b.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_person b
+            WHERE
+                b.STATUS > 0
+                AND b.org_id = #{orgId}
+                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+                AND b.building_id = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                b.person_id,
+                DATE_FORMAT( b.create_date, '%Y-%m-%d' )
+        ) g ON t.date = g.create_date
+        LEFT JOIN (
+            SELECT
+                count( * ) AS uv_num,
+                u.be_uv AS building_id,
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_uv u
+                LEFT JOIN ta_person p ON u.person_id = p.person_id
+            WHERE
+                tagert_type = 'project'
+                AND p.org_id = #{orgId}
+                AND u.be_uv = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' )
+        ) u ON t.date = u.create_date
+        ORDER BY create_date
+    </select>
+    <select id="getStatsTimeTableList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
+        SELECT
+        t.date as create_date,
+        IFNULL( s.sk_num, 0 ) AS sk_num,
+        IFNULL( g.gk_num, 0 ) AS gk_num,
+        IFNULL( u.uv_num, 0 ) AS uv_num,
+        IFNULL( s.sk_num, 0 ) + IFNULL( g.gk_num, 0 ) AS kh_num
+        FROM
+        (
+        SELECT
+        DATE_FORMAT( DATE_SUB( #{endDate}, INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM
+        sequence a
+        WHERE
+        a.rownum &lt;= datediff( #{endDate}, #{startDate} )
+        ) t
+        LEFT JOIN (
+        SELECT
+        count( * ) AS sk_num,
+        a.building_id,
+        DATE_FORMAT( a.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_recommend_customer a
+        WHERE
+        a.STATUS > 0
+        AND a.verify_status = 1
+        AND a.realty_consultant IS NOT NULL
+        AND a.realty_consultant != ''
+        AND a.org_id = #{orgId}
+        AND a.building_id = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        DATE_FORMAT( a.create_date, '%Y-%m-%d' )
+        ) s ON t.date = s.create_date
+        LEFT JOIN (
+        SELECT
+        count( * ) AS gk_num,
+        b.building_id,
+        DATE_FORMAT( b.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_person b
+        WHERE
+        b.STATUS > 0
+        AND b.org_id = #{orgId}
+        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+        AND b.building_id = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        b.person_id,
+        DATE_FORMAT( b.create_date, '%Y-%m-%d' )
+        ) g ON t.date = g.create_date
+        LEFT JOIN (
+        SELECT
+        count( * ) AS uv_num,
+        u.be_uv AS building_id,
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
+        WHERE
+        u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
+        AND u.be_uv = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' )
+        ) u ON t.date = u.create_date
+        ORDER BY
+        <if test="sortField != null and sortField != ''">
+             ${sortField} ${orderType},
+        </if>
+        create_date desc
+    </select>
+
 </mapper>

src/main/resources/mapper/TaCustomerFromMapper.xml

@@ -0,0 +1,15 @@
+<?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.TaCustomerFromMapper">
+
+    <select id="countPerson" resultType="java.util.HashMap">
+        SELECT
+            count( 1 ) AS orgCount,
+            IFNULL( sum( IF ( t.building_id = #{buildingId}, 1, 0 ) ), 0 ) AS projectCount
+        FROM
+            ta_customer_from t
+        WHERE
+            t.org_id = #{orgId}
+        AND t.person_id = #{personId}
+    </select>
+</mapper>

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -40,10 +40,11 @@
          and t.building_id = #{buildingId}
     </if>
     <if test="personBuildingList != null and personBuildingList.size > 0">
-        AND t.building_id in
+        AND (t.building_id in
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
             #{personBuilding.buildingId}
         </foreach>
+        or t.create_user = #{userId})
     </if>
         order by t.weight desc
     </select>