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

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/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/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/excel/ActivityStatistics/ShareNum.java

@@ -37,12 +37,12 @@ public class ShareNum {
     @ExcelProperty(value = "分享时间", index = 3)
     private String shareTime;
 
-    /**
-     * 访问人数
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "访问人数", index = 4)
-    private Integer visitPersonNum;
+//    /**
+//     * 访问人数
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "访问人数", index = 4)
+//    private Integer visitPersonNum;
 
     @ExcelIgnore
     private String sharePersonId;

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

@@ -56,23 +56,31 @@ public class VisitPersonNum {
     private String realtyConsultantPhone;
 
     /**
-     * 分享者
+     * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "分享者", index = 7)
+    @ExcelProperty(value = "推广人", index = 7)
     private String sharePersonName;
-
-    /**
-     * 分享者电话
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "分享者电话", index = 8)
-    private String sharePersonPhone;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
 
     /**
      * 访问次数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问次数", index = 9)
+    @ExcelProperty(value = "访问次数", index = 8)
     private String visitNum;
+
+
 }

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

@@ -35,4 +35,45 @@ public class IntentionUser {
     @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 = 9)
+    private String gender;
 }

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

@@ -64,7 +64,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
 
     @Autowired
     private TdCityMapper cityMapper;
-    
+
     @Autowired
     private TaCustomerFollowUpRecordMapper customerFollowUpRecordMapper;
 
@@ -217,7 +217,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);
@@ -233,8 +233,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"));
@@ -248,11 +257,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());
         }
 
@@ -277,24 +286,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);
@@ -311,9 +310,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);
@@ -367,12 +365,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"));
@@ -399,11 +397,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());
@@ -419,29 +417,29 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         // 报备有 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);
@@ -518,106 +516,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) {
 
         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);
         } 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);
         }
 
     }
 
     @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());
                     }
                 }
@@ -625,19 +621,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);
@@ -645,26 +641,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() : "");
             }
@@ -674,46 +670,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());
                     }
                 }
@@ -721,25 +717,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() : "");
                 }
@@ -749,17 +745,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
@@ -801,8 +797,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);
             }
         }
@@ -881,24 +877,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);
     }
 
 
@@ -911,7 +907,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     public List<AgentsRecommendCustomer> getIndependentAgentsExport(Integer orgId, Integer pageCode, Integer pageSize) {
         return taRecommendCustomerMapper.getIndependentAgentsExport(orgId, pageCode, pageSize);
     }
-    
+
     /**
      * 查询我的客户人数集合
      *
@@ -924,12 +920,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);
     }
-    
+
     /**
      * 分页查询我的跟进客户集合
      *
@@ -951,18 +947,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);
     }
-    
+
     /**
      * 获取盘客工具下我的客户详情
      *
@@ -976,14 +972,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);
     }
-    
+
     /**
      * 更新我的客户基本信息
      *
@@ -997,16 +993,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/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 (d.target_type = a.target_type OR d.event_type = a.target_type)
+            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 (e.target_type = a.target_type OR e.event_type = a.target_type)
+            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

@@ -432,7 +432,7 @@
                     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.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>
@@ -451,8 +451,10 @@
                 u.be_uv AS building_id
             FROM
                 ta_uv u
-            WHERE
+            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>
@@ -523,7 +525,7 @@
         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.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>
@@ -542,8 +544,10 @@
         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>
@@ -631,21 +635,23 @@
         LEFT JOIN (
             SELECT
                 count( * ) AS uv_num,
-                be_uv AS building_id,
-                DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+                u.be_uv AS building_id,
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
             FROM
-                ta_uv
+                ta_uv u
+                LEFT JOIN ta_person p ON u.person_id = p.person_id
             WHERE
                 tagert_type = 'project'
-                AND be_uv = #{buildingId}
+                AND p.org_id = #{orgId}
+                AND u.be_uv = #{buildingId}
                 <if test="startDate != null">
-                    and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+                    and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
                 </if>
                 <if test="endDate != null">
-                    and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+                    and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
                 </if>
             GROUP BY
-                DATE_FORMAT( create_date, '%Y-%m-%d' )
+                DATE_FORMAT( u.create_date, '%Y-%m-%d' )
         ) u ON t.date = u.create_date
         ORDER BY create_date
     </select>
@@ -714,27 +720,29 @@
         LEFT JOIN (
         SELECT
         count( * ) AS uv_num,
-        be_uv AS building_id,
-        DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+        u.be_uv AS building_id,
+        DATE_FORMAT( u.create_date, '%Y-%m-%d' ) AS create_date
         FROM
-        ta_uv
+        ta_uv u
+        LEFT JOIN ta_person p ON u.person_id = p.person_id
         WHERE
-        tagert_type = 'project'
-        AND be_uv = #{buildingId}
+        u.tagert_type = 'project'
+        AND p.org_id = #{orgId}
+        AND u.be_uv = #{buildingId}
         <if test="startDate != null">
-            and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+            and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
         </if>
         <if test="endDate != null">
-            and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+            and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
         </if>
         GROUP BY
-        DATE_FORMAT( create_date, '%Y-%m-%d' )
+        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
+        create_date desc
     </select>
 
 </mapper>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -43,31 +43,79 @@
         ORDER BY SUM(tpir.intention) DESC
     </select>
     <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
+        select t.*, IFNULL(b.nickname, c.user_name) as sharePersonName, ifnull(b.phone, c.phone) as sharePersonPhone From (
+
         SELECT
-        tpir.person_name as  person_name,
+        tpir.person_name as person_name,
+        if(tp.gender = '1' , '男', if(tp.gender = '2', '女', '未知')) as gender,
         tp.phone as phone,
-        tpir.building_name as building_name,
+        tp.province,
+        tpir.person_id,
+        tpir.building_name,
+        tpir.building_id,
+        d.user_name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
         SUM(tpir.intention) as intention
-        FROM
-        ta_person_intention_record tpir
-        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+
+        FROM ta_person_intention_record tpir
+        LEFT JOIN ta_person tp ON tpir.person_id = tp.person_id
+        left join ta_recommend_customer c on c.person_id = tpir.person_id
+        left join ta_user d on c.realty_consultant = d.user_id
         <trim prefix="where" prefixOverrides="and | or">
-            <if test="buildingId != null and buildingId != ''">
-                tpir.building_id = #{buildingId}
-            </if>
             <if test="orgId != null">
                 AND tpir.org_id = #{orgId}
                 AND tp.org_id = #{orgId}
             </if>
+        </trim>
+        GROUP BY tpir.person_id, tpir.building_id
+
+        ) as t
+        left join ta_share_person_from a on t.person_id = a.person_id
+        left join ta_user c on a.share_person = c.user_id
+        left join ta_person b on a.share_person = b.person_id
+
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="buildingId != null and buildingId != ''">
+                t.building_id = #{buildingId}
+            </if>
             <if test="personBuildingList != null and personBuildingList.size > 0">
-                AND tpir.building_id in
+                AND t.building_id in
                 <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
                     #{personBuilding.buildingId}
                 </foreach>
             </if>
         </trim>
-        GROUP BY
-        tpir.person_id, tpir.building_id
-        ORDER BY SUM(tpir.intention) DESC
+
+        group by t.person_id, t.building_id
+        order by t.intention desc
+
+
+
+<!--        SELECT-->
+<!--        tpir.person_name as  person_name,-->
+<!--        tp.phone as phone,-->
+<!--        tpir.building_name as building_name,-->
+<!--        SUM(tpir.intention) as intention-->
+<!--        FROM-->
+<!--        ta_person_intention_record tpir-->
+<!--        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id-->
+<!--        <trim prefix="where" prefixOverrides="and | or">-->
+<!--            <if test="buildingId != null and buildingId != ''">-->
+<!--                tpir.building_id = #{buildingId}-->
+<!--            </if>-->
+<!--            <if test="orgId != null">-->
+<!--                AND tpir.org_id = #{orgId}-->
+<!--                AND tp.org_id = #{orgId}-->
+<!--            </if>-->
+<!--            <if test="personBuildingList != null and personBuildingList.size > 0">-->
+<!--                AND tpir.building_id in-->
+<!--                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">-->
+<!--                    #{personBuilding.buildingId}-->
+<!--                </foreach>-->
+<!--            </if>-->
+<!--        </trim>-->
+<!--        GROUP BY-->
+<!--        tpir.person_id, tpir.building_id-->
+<!--        ORDER BY SUM(tpir.intention) DESC-->
     </select>
 </mapper>

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

@@ -47,6 +47,16 @@
                 <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                     #{taPersonBuilding.buildingId}
                 </foreach>
+            or
+                c.building_id in
+                <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                    #{taPersonBuilding.buildingId}
+                </foreach>
+            or
+            d.building_id in
+                <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                    #{taPersonBuilding.buildingId}
+                </foreach>
               or d.create_user = #{userId}
               or c.create_user = #{userId}
             )
@@ -100,6 +110,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -232,6 +252,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -310,6 +340,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -561,6 +601,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -786,6 +836,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -857,7 +917,8 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            end)
         </if>
         <if test="startDate != null">
             and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -890,7 +951,8 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            end)
         </if>
         <if test="startDate != null">
             and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1043,7 +1105,7 @@
         ) as activity
 
         left join (
-            SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type
+            SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type, a.create_date
             FROM ta_share_count a where a.tagert_type in (
             'activity', 'group','h5','help','liveApp','livePost')
             and a.org_id = #{orgId}
@@ -1060,7 +1122,7 @@
             <if test="startDate == null or endDate == null ">
                 AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
             </if>
-            group by a.be_share,a.tagert_type
+            group by a.be_share,a.tagert_type order by a.create_date desc limit 9999999
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -1081,7 +1143,7 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id
+        group by a.person_id, be_share
 <!--        , be_share, tagert_type-->
         ) as sharePersonNum group by sharePersonNum.be_share, sharePersonNum.tagert_type
         ) as sharePersonNum on sharePersonNum.be_share = activity.activityId and sharePersonNum.tagert_type =
@@ -1135,7 +1197,7 @@
         and a.status = 1
         and a.is_first_time = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and a.target_type = #{targetType}
+            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1148,8 +1210,7 @@
         </if>
         group by a.person_id, a.target_type ,a.target_id
         ) as addRegistNum group by addRegistNum.target_type, addRegistNum.target_id
-        ) as addRegistNum on addRegistNum.target_id = activity.activityId and substring_index(addRegistNum.target_type,
-        '_share', 1) = activity.activityType
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = substring_index(REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity_share') , '_share', 1)
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
@@ -1179,7 +1240,7 @@
             and a.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and a.title = #{activityName}
+            and a.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and a.building_id in
@@ -1194,7 +1255,7 @@
             and b.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and b.title = #{activityName}
+            and b.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and b.building_id in
@@ -1210,7 +1271,7 @@
             and c.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and c.activity_name = #{activityName}
+            and c.activity_name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and c.building_id in
@@ -1225,7 +1286,7 @@
             and d.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and d.name = #{activityName}
+            and d.name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and (d.building_id in
@@ -1243,7 +1304,7 @@
             and e.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and e.live_activity_title = #{activityName}
+            and e.live_activity_title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and (e.building_id in
@@ -1256,12 +1317,13 @@
         ) as activity
 
         left join (
-        SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type
+        SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type, a.create_date
         FROM ta_share_count a where a.tagert_type in (
         'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
-            and a.tagert_type = #{targetType}
+            and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
+            end)
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1272,7 +1334,7 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.be_share,a.tagert_type
+        group by a.be_share,a.tagert_type order by a.create_date desc limit 9999999
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -1281,7 +1343,8 @@
         From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
-            and a.tagert_type = #{targetType}
+            and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
+            end)
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1292,7 +1355,8 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id, be_share, tagert_type
+        group by a.person_id, be_share
+        <!--        , be_share, tagert_type-->
         ) as sharePersonNum group by sharePersonNum.be_share, sharePersonNum.tagert_type
         ) as sharePersonNum on sharePersonNum.be_share = activity.activityId and sharePersonNum.tagert_type =
         activity.activityType
@@ -1345,7 +1409,7 @@
         and a.status = 1
         and a.is_first_time = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and a.target_type = #{targetType}
+            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1358,8 +1422,7 @@
         </if>
         group by a.person_id, a.target_type ,a.target_id
         ) as addRegistNum group by addRegistNum.target_type, addRegistNum.target_id
-        ) as addRegistNum on addRegistNum.target_id = activity.activityId and substring_index(addRegistNum.target_type,
-        '_share', 1) = activity.activityType
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = substring_index(REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity_share') , '_share', 1)
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
@@ -1419,6 +1482,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -1443,8 +1516,8 @@
         ) as person
 
         left join (
-            select * from (
-                SELECT count(*) as shareNum, t.person_id
+            select count(*) as shareNum, temp.person_id from (
+                SELECT t.person_id, t.create_date
                 FROM ta_share_count t
                 LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
                 LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
@@ -1463,8 +1536,8 @@
                     and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
                     end)
                 </if>
-                group by person_id
-            ) as temp
+                order by t.create_date desc limit 999999
+            ) as temp group by temp.person_id order by temp.create_date desc
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
@@ -1523,7 +1596,14 @@
         ifnull(shareNum, 0) as shareNum,
         ifnull(visitNum, 0) as visitNum,
         ifnull(visitPersonNum, 0) as visitPersonNum,
-        person.person_type as sharePersonType,
+        CASE
+        WHEN person.person_type = 'drift' THEN
+        "游客"
+        WHEN person.person_type = 'customer' THEN
+        "普通客户"
+        WHEN person.person_type = 'Realty Consultant' THEN
+        "置业顾问"
+        END `sharePersonType`,
         person.person_id
         from (
         SELECT t.*, f.nickname, f.phone, f.person_type
@@ -1563,6 +1643,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -1587,8 +1677,8 @@
         ) as person
 
         left join (
-        select * from (
-        SELECT count(*) as shareNum, t.person_id
+        select count(*) as shareNum, temp.person_id from (
+        SELECT t.person_id, t.create_date
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a ON t.be_share = a.help_activity_id
         LEFT JOIN ta_share_activity b ON t.be_share = b.share_id
@@ -1607,8 +1697,8 @@
             and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
             end)
         </if>
-        group by person_id
-        ) as temp
+        order by t.create_date desc limit 999999
+        ) as temp group by temp.person_id order by temp.create_date desc
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
@@ -1645,7 +1735,9 @@
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId}
+        <!--        group by t.share_person -->
+        ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
@@ -1707,6 +1799,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -1779,7 +1881,8 @@
             and t.be_share = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.tagert_type = #{activityType}
+            and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and (
@@ -1806,6 +1909,16 @@
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
                 #{taPersonBuilding.buildingId}
             </foreach>
+            or
+            c.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+            or
+            d.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
             or d.create_user = #{userId}
             or c.create_user = #{userId}
             )
@@ -1857,18 +1970,18 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        GROUP_CONCAT(c.name) as realtyConsultant,
-        ifnull(d.phone, d.tel) as realtyConsultantPhone,
-        ifnull(e.nickname, f.user_name) as sharePersonName,
-        ifnull(e.phone, e.tel) as sharePersonPhone
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        ifnull(e.nickname, f.name) as sharePersonName,
+        ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join ta_recommend_customer c on c.person_id = t.person_id
-        left join ta_person d on c.recommend_person = d.person_id
-        left join ta_person e on t.share_person = e.person_id
-        left join ta_user f on t.share_person = f.user_id
+        LEFT JOIN ta_user d ON c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON t.share_person = e.person_id
+        LEFT JOIN ta_person f ON t.share_person = f.user_id
         WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId} and t.status = 1
         and t.is_first_time = 1
@@ -1878,7 +1991,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(#{activityType}, '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="province != null and province != ''">
             and a.province like concat('%', #{province}, '%')
@@ -1889,7 +2002,7 @@
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
         </if>
-        group by t.person_id
+        group by t.person_id order by t.create_date desc
     </select>
 
     <select id="selectActivityAddRegistNumExport"
@@ -1899,18 +2012,18 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        GROUP_CONCAT(c.name) as realtyConsultant,
-        ifnull(d.phone, d.tel) as realtyConsultantPhone,
-        ifnull(e.nickname, f.user_name) as sharePersonName,
-        ifnull(e.phone, e.tel) as sharePersonPhone
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        ifnull(e.nickname, f.name) as sharePersonName,
+        ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         left join ta_recommend_customer c on c.person_id = t.person_id
-        left join ta_person d on c.recommend_person = d.person_id
-        left join ta_person e on t.share_person = e.person_id
-        left join ta_user f on t.share_person = f.user_id
+        LEFT JOIN ta_user d ON c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON t.share_person = e.person_id
+        LEFT JOIN ta_person f ON t.share_person = f.user_id
         WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId} and t.status = 1
         and t.is_first_time = 1
@@ -1920,7 +2033,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(#{activityType}, '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         <if test="province != null and province != ''">
             and a.province like concat('%', #{province}, '%')
@@ -1931,7 +2044,7 @@
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
         </if>
-        group by t.person_id
+        group by t.person_id order by t.create_date desc
     </select>
 
     <select id="selectActivityVisitNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
@@ -2068,7 +2181,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         from (
         SELECT
@@ -2101,12 +2214,11 @@
         GROUP BY
         t.person_id ) as t
         left join ta_person a on t.person_id = a.person_id
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId}
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time = 1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
         left join ta_user d on c.realty_consultant = d.user_id
-        left join ta_person e on e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
                 and b.scene_type = #{personFrom}
@@ -2135,7 +2247,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         from (
         SELECT
@@ -2172,8 +2284,7 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
         left join ta_user d on c.realty_consultant = d.user_id
-        left join ta_person e on e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
                 and b.scene_type = #{personFrom}
@@ -2202,7 +2313,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
@@ -2228,8 +2339,7 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
         left join ta_user d on c.realty_consultant = d.user_id
-        left join ta_person e on e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         group by t.person_id
     </select>
 
@@ -2287,20 +2397,21 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
         FROM ta_share_person_from t
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
-        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
-        ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
+        and t.target_type in
+        ('dynamic_share','h5_share','help_share','live_share', 'group_share')
         and
         (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})
         or t.share_person = #{personId})
@@ -2312,8 +2423,7 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         LEFT JOIN ta_recommend_customer c on c.person_id = t.person_id
         left join ta_user d on c.realty_consultant = d.user_id
-        left join ta_person e on e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         group by t.person_id
     </select>
 
@@ -2330,17 +2440,16 @@
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         From (
-        SELECT t.person_id, t.create_date
+        SELECT t.person_id, t.create_date, t.share_person
         FROM ta_share_person_from t
         LEFT JOIN (
-        SELECT a.person_id, b.user_id, t.share_person
+        SELECT a.person_id, b.user_id
         FROM ta_person a
         LEFT JOIN ta_user b
         ON a.user_id = b.user_id
         WHERE a.org_id = #{orgId} ) as a ON t.share_person = a.person_id or t.share_person = a.user_id
         WHERE t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
-        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
-        and t.target_type in
+        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}