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

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

@@ -42,4 +42,6 @@ public class ShareNum {
     @ColumnWidth(15)
     @ExcelProperty(value = "访问人数", index = 4)
     private Integer visitPersonNum;
+
+    private String sharePersonId;
 }

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

@@ -48,4 +48,5 @@ public class SharePersonNum {
     @ExcelProperty(value = "访问次数", index = 5)
     private Integer visitNum;
 
+    private String personId;
 }

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

@@ -190,10 +190,11 @@ public class ActivityStatisticController extends BaseController {
                                                      @RequestParam(value = "sharePhone", required = false)String sharePhone,
                                                      @RequestParam(value = "activityId", required = false)String activityId,
                                                      @RequestParam(value = "activityType", required = false)String activityType,
+                                                     @RequestParam(value = "personId", required = false)String personId,
                                                      @RequestParam(value = "sort", required = false)String sort,
                                                      @RequestParam(value = "colKey", required = false)String colKey,
                                                      HttpServletRequest request) {
-        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, sort, colKey);
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, sort, colKey);
     }
 
     /**
@@ -271,8 +272,9 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
                                                    @RequestParam(value = "activityId", required = false)String activityId,
                                                    @RequestParam(value = "activityType", required = false)String activityType,
+                                                   @RequestParam(value = "personId", required = false)String personId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId);
     }
 
     /**
@@ -311,10 +313,11 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "province", required = false)String province,
                                                @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
                                                @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                               @RequestParam(value = "personId", required = false)String personId,
                                                @RequestParam(value = "activityId", required = false)String activityId,
                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId);
     }
 
     /**
@@ -340,4 +343,5 @@ public class ActivityStatisticController extends BaseController {
         // finish 会帮忙关闭流
         excelWriter.finish();
     }
+
 }

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

@@ -12,29 +12,29 @@ import java.util.Map;
 
 @Mapper
 public interface TaActicityStaticMapper {
-    Integer selectSharePersonNum(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
+    Integer selectSharePersonNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
 
-    Integer selectShareNum(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
+    Integer selectShareNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
 
-    Integer selectVisitPersonNum(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
+    Integer selectVisitPersonNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
 
-    Integer selectVisitNum(@Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
+    Integer selectVisitNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
 
-    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
 
-    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
 
-    List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
 
-    List<Map<String, Object>> selectVisitPersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectVisitPersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
 
-    List<Map<String, Object>> selectAddRegistCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectAddRegistCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
 
     IPage<StatisicAttractUser> selectTableData(
             IPage<StatisicAttractUser> attractUserIPage,
             @Param("orgId") Integer orgId,
-            @Param("startDate") LocalDate startDate,
-            @Param("endDate") LocalDate endDate,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
             @Param("buildingId") String buildingId,
             @Param("targetType") String targetType,
             @Param("sortType") String sortType,
@@ -42,8 +42,8 @@ public interface TaActicityStaticMapper {
 
     List<StatisicAttractUser> selectExportTableData(
             @Param("orgId") Integer orgId,
-            @Param("startDate") LocalDate startDate,
-            @Param("endDate") LocalDate endDate,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
             @Param("buildingId") String buildingId,
             @Param("targetType") String targetType,
             @Param("sortType") String sortType,
@@ -52,8 +52,8 @@ public interface TaActicityStaticMapper {
     IPage<ActivityDetailShareRecord> selectActivityStatisDetail(
             IPage<ActivityDetailShareRecord> attractUserIPage,
             @Param("orgId") Integer orgId,
-            @Param("startDate") LocalDate startDate,
-            @Param("endDate") LocalDate endDate,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
             @Param("buildingId") String buildingId,
             @Param("targetType") String targetType,
             @Param("activityName") String activityName,
@@ -107,6 +107,7 @@ public interface TaActicityStaticMapper {
             @Param("sharePhone") String sharePhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
+            @Param("personId") String personId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -185,4 +186,24 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone
     );
 
+    IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
+            IPage<VisitPersonNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType
+    );
+
+    IPage<VisitNum> selectActivityVisitNumByPersonId(
+            IPage<VisitNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personId") String personId,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType
+    );
+
 }

src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.statistic.service.impl;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -25,13 +26,13 @@ public class TaActivityStaticServiceImpl {
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> map = new HashMap<>();
 
-        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(startDate, endDate, buidling, targetType, orgId);
+        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
 
-        Integer shareNum = taActicityStaticMapper.selectShareNum(startDate, endDate, buidling, targetType, orgId);
+        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
 
-        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(startDate, endDate, buidling, targetType, orgId);
+        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
 
-        Integer visitNum = taActicityStaticMapper.selectVisitNum(startDate, endDate, buidling, targetType, orgId);
+        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), buidling, targetType, orgId);
 
         map.put("sharePersonNum", sharePersonNum);
         map.put("shareNum", shareNum);
@@ -47,11 +48,11 @@ public class TaActivityStaticServiceImpl {
         ResponseBean responseBean = new ResponseBean();
 
         // 新增用户数
-        List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, startDate, endDate, buildingId, targetType);
-        List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, startDate, endDate, buildingId, targetType);
-        List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, startDate, endDate, buildingId, targetType);
-        List<Map<String, Object>> selectVisitPersonCount = taActicityStaticMapper.selectVisitPersonCount(orgId, startDate, endDate, buildingId, targetType);
-        List<Map<String, Object>> selectAddRegistCount = taActicityStaticMapper.selectAddRegistCount(orgId, startDate, endDate, buildingId, targetType);
+        List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
+        List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
+        List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
+        List<Map<String, Object>> selectVisitPersonCount = taActicityStaticMapper.selectVisitPersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
+        List<Map<String, Object>> selectAddRegistCount = taActicityStaticMapper.selectAddRegistCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
 
 
         for (Map<String, Object> ssc : selectShareCount){
@@ -91,19 +92,19 @@ public class TaActivityStaticServiceImpl {
     public ResponseBean selectTableData(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey){
         IPage<StatisicAttractUser> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, startDate, endDate, buildingId, targetType, sortType, colKey);
+        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey);
         return ResponseBean.success(data);
     }
 
     public List<StatisicAttractUser> selectExportTableData(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectExportTableData(orgId, startDate, endDate, buildingId, targetType, sortType, colKey);
+        return taActicityStaticMapper.selectExportTableData(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey);
     }
 
     public ResponseBean selectActivityStatisDetail(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey){
         IPage<ActivityDetailShareRecord> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey);
+        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, activityName, sortType, colKey);
         return ResponseBean.success(data);
     }
 
@@ -125,11 +126,11 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, sortType, colKey);
     }
 
-    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String sort, String colKey){
+    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String sort, String colKey){
         IPage<ShareNum> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
 
-        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, sortType, colKey);
+        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, sortType, colKey);
         return ResponseBean.success(data);
     }
 
@@ -148,9 +149,15 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom);
     }
 
-    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType){
+    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId){
         IPage<VisitNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<VisitNum> data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+        IPage<VisitNum> data;
+        if (StringUtils.isEmpty(personId)){
+            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+        }else{
+            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType);
+        }
+
         return ResponseBean.success(data);
     }
 
@@ -158,13 +165,20 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityVisitNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone);
     }
 
-    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType){
+    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId){
         IPage<VisitPersonNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<VisitPersonNum> data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+        IPage<VisitPersonNum> data;
+        if (StringUtils.isEmpty(personId)){
+            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+        }else{
+            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType);
+        }
+
         return ResponseBean.success(data);
     }
 
     public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone){
         return taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone);
     }
+
 }

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

@@ -126,10 +126,10 @@
             and t.tagert_type = #{targetType}
         </if>
         <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -182,10 +182,10 @@
                     and t.tagert_type = #{targetType}
                 </if>
                 <if test="startDate != null ">
-                    and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null ">
-                    and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null ">
                     AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -232,10 +232,10 @@
             and t.target_type =  #{targetType}
         </if>
         <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -267,31 +267,33 @@
         </trim>
         ) AS temp_date
         LEFT JOIN (
-        SELECT
-        COUNT( 1 ) AS user_count,
-        t.visit_time AS create_date
-        FROM
-        ta_person_visit_record t
-        WHERE
-        t.`event` = 'detail'  and t.event_type in ('activity','help','group','h5') and t.org_id = #{orgId}
-        <if test="buildingId != null and buildingId != ''">
-            and t.building_id =  #{buildingId}
-        </if>
-        <if test="targetType != null and targetType != ''">
-            and t.target_type =  #{targetType}
-        </if>
-        <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
-        </if>
-        <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
-        </if>
-        <if test="startDate == null or endDate == null">
-            AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-        </if>
-        GROUP BY
-        DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) , person_id
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
+            select  count(*) AS user_count , visitPersonCount.* from (
+            SELECT
+            t.visit_time AS create_date,
+            t.person_id
+            FROM
+            ta_person_visit_record t
+            WHERE
+            t.`event` = 'detail'  and t.event_type in ('activity','help','group','h5') and t.org_id = #{orgId}
+            <if test="buildingId != null and buildingId != ''">
+                and t.building_id =  #{buildingId}
+            </if>
+            <if test="targetType != null and targetType != ''">
+                and t.target_type =  #{targetType}
+            </if>
+            <if test="startDate != null">
+                and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="endDate != null">
+                and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="startDate == null or endDate == null">
+                AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            GROUP BY
+            DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
+            person_id) as visitPersonCount GROUP BY DATE_FORMAT(visitPersonCount.create_date, '%Y-%m-%d')
+            ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
         ) AS visit_person_count_table
         group by date order by date
     </select>
@@ -331,10 +333,10 @@
             and t.target_type =  #{targetType}
         </if>
         <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -382,10 +384,10 @@
             and t.tagert_type = #{targetType}
         </if>
         <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -413,15 +415,15 @@
                     and t.tagert_type = #{targetType}
                 </if>
                 <if test="startDate != null ">
-                    and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null ">
-                    and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null ">
                     AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
                 </if>
-                GROUP BY t.person_id
+                GROUP BY t.person_id, DATE_FORMAT( t.create_date, '%Y-%m-%d' )
             ) as temp1
         ) AS temp1 ON temp_date.date = DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
         LEFT JOIN (
@@ -439,10 +441,10 @@
             and t.target_type =  #{targetType}
         </if>
         <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -466,10 +468,10 @@
                 and t.target_type =  #{targetType}
             </if>
             <if test="startDate != null">
-                and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
             </if>
             <if test="endDate != null">
-                and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
             </if>
             <if test="startDate == null or endDate == null">
                 AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -495,10 +497,10 @@
                 and t.target_type =  #{targetType}
             </if>
             <if test="startDate != null ">
-                and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
             </if>
             <if test="endDate != null ">
-                and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
             </if>
             <if test="startDate == null or endDate == null">
                 AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -513,7 +515,6 @@
         <if test="colKey != null and colKey != ''">
             ORDER BY  ${colKey} ${sortType}
         </if>
-
     </select>
     <select id="selectExportTableData" resultType="com.huiju.estateagents.excel.ActivityStatistics.StatisicAttractUser">
         SELECT date, ifnull(shareNum ,0) as shareNum, ifnull(sharePersonNum, 0) as sharePersonNum, ifnull(visitNum, 0) as visitNum, ifnull(visitPersonNum, 0) as visitPersonNum, ifnull(addRegistNum,0) as addRegistNum
@@ -550,10 +551,10 @@
             and t.tagert_type = #{targetType}
         </if>
         <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -581,15 +582,15 @@
             and t.tagert_type = #{targetType}
         </if>
         <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY t.person_id
+        GROUP BY t.person_id, DATE_FORMAT( t.create_date, '%Y-%m-%d' )
         ) as temp1
         ) AS temp1 ON temp_date.date = DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
         LEFT JOIN (
@@ -607,10 +608,10 @@
             and t.target_type =  #{targetType}
         </if>
         <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null ">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -634,10 +635,10 @@
             and t.target_type =  #{targetType}
         </if>
         <if test="startDate != null">
-            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null">
-            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null">
             AND t.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -663,10 +664,10 @@
             and t.target_type =  #{targetType}
         </if>
         <if test="startDate != null ">
-            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="endDate != null ">
-            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
         </if>
         <if test="startDate == null or endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -746,10 +747,10 @@
                     and a.tagert_type = #{targetType}
                 </if>
                 <if test="startDate != null ">
-                    and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null ">
-                    and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null ">
                     AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -765,10 +766,10 @@
                     and a.tagert_type = #{targetType}
                 </if>
                 <if test="startDate != null ">
-                    and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null ">
-                    and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null ">
                     AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -781,13 +782,13 @@
             select * from (
                 select count(*) as visitNum, a.target_id, a.event_type From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
                 <if test="targetType != null and targetType != ''">
-                    and a.target_type =  #{targetType}
+                    and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType} end)
                 </if>
                 <if test="startDate != null">
-                    and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null">
-                    and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null ">
                     AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -800,13 +801,13 @@
             select count(*) as visitPersonNum ,visitPersonNum.target_id, visitPersonNum.event_type  from (
                 select  a.* From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
                 <if test="targetType != null and targetType != ''">
-                    and a.target_type =  #{targetType}
+                    and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType} end)
                 </if>
                 <if test="startDate != null">
-                    and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null">
-                    and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null ">
                     AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -823,10 +824,10 @@
                     and a.target_type =  #{targetType}
                 </if>
                 <if test="startDate != null ">
-                    and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+                    and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="endDate != null ">
-                    and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+                    and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
                 </if>
                 <if test="startDate == null or endDate == null">
                     AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
@@ -1000,7 +1001,9 @@
                ifnull(shareNum, 0) as shareNum,
                ifnull(visitNum, 0) as visitNum,
                ifnull(visitPersonNum, 0) as visitPersonNum,
-            person.person_type as sharePersonType from (
+            person.person_type as sharePersonType,
+            person.person_id
+            from (
             SELECT t.*, f.nickname, f.tel, f.person_type
             FROM ta_share_count t
             LEFT JOIN ta_help_activity a
@@ -1059,6 +1062,10 @@
 
         left join (
             select count(1) as visitNum, t.share_person as person_id From ta_share_person_from t
+            left join
+            (
+            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 ('dynamic_share','h5_share','help_share','live_share', 'group_share') group by  t.share_person
         ) as visitNum on visitNum.person_id = person.person_id
@@ -1066,6 +1073,10 @@
         left join (
             select count(1) as visitPersonNum, visitNum.share_person as person_id From (
                 select count(1), t.share_person From ta_share_person_from t
+                left join
+                (
+                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 ('dynamic_share','h5_share','help_share','live_share', 'group_share')
                 group by  t.person_id, t.share_person
@@ -1138,17 +1149,25 @@
 
         left join (
         select count(1) as visitNum, t.share_person as person_id From ta_share_person_from t
+        left join
+        (
+        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 ('dynamic_share','h5_share','help_share','live_share', 'group_share') group by  t.share_person
         ) as visitNum on visitNum.person_id = person.person_id
 
         left join (
-        select count(1) as visitPersonNum, visitNum.share_person as person_id From (
-        select count(1), t.share_person 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')
-        group by  t.person_id, t.share_person
-        ) as visitNum group by visitNum.share_person
+            select count(1) as visitPersonNum, visitNum.share_person as person_id From (
+                select count(1), t.share_person From ta_share_person_from t
+                left join
+                (
+                    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 ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+                group by  t.person_id, t.share_person
+            ) as visitNum group by visitNum.share_person
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
         <if test="colKey == null or colKey == ''">
             order by person.create_date desc
@@ -1189,11 +1208,23 @@
             and t.org_id = #{orgId}
             and 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' )
+            <if test="personId != null and personId != ''">
+                and t.person_id = #{personId}
+            </if>
         ) as person
         LEFT JOIN (
             SELECT count(*) as visitPersonNum,t.share_person as person_id
             FROM ta_share_person_from t
-            where  t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId} group by t.person_id
+            where  t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+            <if test="personId != null and personId != ''">
+                and t.share_person = #{personId}
+            </if>
+            <if test="startDate != null ">
+                and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
+            </if>
+            <if test="endDate != null ">
+                and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+            </if>
         ) as visitPersonNum
         ON visitPersonNum.person_id = person.person_id order by person.create_date desc
     </select>
@@ -1427,7 +1458,7 @@
         'group',
         'h5'
         )
-        AND t.org_id = 84
+        AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         <if test="activityId != null and activityId != ''">
@@ -1488,7 +1519,7 @@
         'group',
         'h5'
         )
-        AND t.org_id = 84
+        AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
         GROUP BY
@@ -1516,5 +1547,66 @@
         </where>
         order by t.create_date desc
     </select>
+    <select id="selectActivityVisitPersonNumByPersonId" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitPersonNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_name as personFrom,
+        d.name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        t.create_date as visitDate,
+        t.visitNum
+        From (
+            SELECT count(1) as visitNum, t.person_id, t.create_date
+            FROM ta_share_person_from t
+            LEFT JOIN (
+            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 ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+            and t.share_person = #{personId} 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 td_wx_dict b1 on b.scene_id = b1.scene_id
+        left join (
+        select d.person_id, d.`name`, d.phone From  ta_recommend_customer c
+        left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
+        ) as d on t.person_id = d.person_id
+    </select>
+
+    <select id="selectActivityVisitNumByPersonId" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
+        select
+        a.nickname, a.phone,
+        if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
+        a.province,
+        b1.scene_name as personFrom,
+        d.name as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        t.create_date as visitDate
+        From (
+        SELECT t.person_id, t.create_date
+        FROM ta_share_person_from t
+        LEFT JOIN (
+        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 ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        and t.share_person = #{personId}
+        ) 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 td_wx_dict b1 on b.scene_id = b1.scene_id
+        left join (
+        select d.person_id, d.`name`, d.phone From  ta_recommend_customer c
+        left join ta_person d on c.recommend_person = d.person_id where c.org_id = #{orgId} group by d.person_id
+        ) as d on t.person_id = d.person_id
+    </select>
 </mapper>