新需求

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

@@ -6,6 +6,9 @@ import lombok.Data;
 
 @Data
 public class ActivityDetailShareRecord {
+
+    private String activityId;
+
     /**
      * 活动类型
      */

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

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

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

@@ -144,10 +144,12 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                                    @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
                                                    @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                                   @RequestParam(value = "activityId", required = false)String activityId,
+                                                   @RequestParam(value = "activityType", required = false)String activityType,
                                                    @RequestParam(value = "sort", required = false)String sort,
                                                    @RequestParam(value = "colKey", required = false)String colKey,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, sort, colKey);
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, sort, colKey);
     }
 
     /**
@@ -176,7 +178,7 @@ public class ActivityStatisticController extends BaseController {
     }
 
     /**
-     * 分享人数统计
+     * 分享次数统计
      * @return
      */
     @GetMapping(value = "/admin/activityStatistical/selectActivityShareNum")
@@ -186,14 +188,16 @@ public class ActivityStatisticController extends BaseController {
                                                      @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                                      @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
                                                      @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                                     @RequestParam(value = "activityId", required = false)String activityId,
+                                                     @RequestParam(value = "activityType", required = false)String activityType,
                                                      @RequestParam(value = "sort", required = false)String sort,
                                                      @RequestParam(value = "colKey", required = false)String colKey,
                                                      HttpServletRequest request) {
-        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, sort, colKey);
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, sort, colKey);
     }
 
     /**
-     * 分享人数统计导出
+     * 分享次数统计导出
      * @return
      */
     @GetMapping(value = "/admin/activityStatistical/selectActivityShareNumExport")
@@ -226,8 +230,10 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                                @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                                @RequestParam(value = "personFrom", required = false)String personFrom,
+                                               @RequestParam(value = "activityId", required = false)String activityId,
+                                               @RequestParam(value = "activityType", required = false)String activityType,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom);
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType);
     }
 
     /**
@@ -252,7 +258,7 @@ public class ActivityStatisticController extends BaseController {
     }
 
     /**
-     * 注册人数统计
+     * 访问次数统计
      * @return
      */
     @GetMapping(value = "/admin/activityStatistical/selectActivityVisitNum")
@@ -263,7 +269,75 @@ 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 = "activityId", required = false)String activityId,
+                                                   @RequestParam(value = "activityType", required = false)String activityType,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone);
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType);
+    }
+
+    /**
+     * 访问次数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitNumExport")
+    public void selectActivityVisitNum(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                               @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                               @RequestParam(value = "personFrom", required = false)String personFrom,
+                                               @RequestParam(value = "province", required = false)String province,
+                                               @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                               @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                               HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=活动统计.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), VisitNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<VisitNum> data = taActivityStaticService.selectActivityVisitNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 访问人数统计
+     * @return
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitPersonNum")
+    public ResponseBean selectActivityVisitPersonNum(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum, @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
+                                               @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                               @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                               @RequestParam(value = "personFrom", required = false)String personFrom,
+                                               @RequestParam(value = "province", required = false)String province,
+                                               @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                               @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                               @RequestParam(value = "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
+     */
+    @GetMapping(value = "/admin/activityStatistical/selectActivityVisitPersonNumExport")
+    public void selectActivityVisitPersonNumExport(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                       @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
+                                       @RequestParam(value = "personFrom", required = false)String personFrom,
+                                       @RequestParam(value = "province", required = false)String province,
+                                       @RequestParam(value = "realtyConsultant", required = false)String realtyConsultant,
+                                       @RequestParam(value = "realtyConsultantPhone", required = false)String realtyConsultantPhone,
+                                       HttpServletRequest request, HttpServletResponse response) throws IOException {
+        response.setContentType("application/octet-stream");
+        response.setCharacterEncoding("utf-8");
+        response.setHeader("Content-disposition", "attachment;filename=活动统计.xlsx");
+        ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), VisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
+        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone);
+        excelWriter.write(data, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
     }
 }

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

@@ -80,6 +80,8 @@ public interface TaActicityStaticMapper {
             @Param("sharePersonType") String sharePersonType,
             @Param("sharePersonName") String sharePersonName,
             @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -103,6 +105,8 @@ public interface TaActicityStaticMapper {
             @Param("sharePersonType") String sharePersonType,
             @Param("sharePersonName") String sharePersonName,
             @Param("sharePhone") String sharePhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -123,7 +127,9 @@ public interface TaActicityStaticMapper {
             @Param("orgId") Integer orgId,
             @Param("startDate") LocalDateTime startDate,
             @Param("endDate") LocalDateTime endDate,
-            @Param("personFrom") String personFrom
+            @Param("personFrom") String personFrom,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType
     );
 
     List<AddRegistNum> selectActivityAddRegistNumExport(
@@ -135,6 +141,41 @@ public interface TaActicityStaticMapper {
 
     IPage<VisitNum> selectActivityVisitNum(
             IPage<VisitNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType
+    );
+
+    List<VisitNum> selectActivityVisitNumExport(
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone
+    );
+
+    IPage<VisitPersonNum> selectActivityVisitPersonNum(
+            IPage<VisitPersonNum> iPage,
+            @Param("orgId") Integer orgId,
+            @Param("startDate") LocalDateTime startDate,
+            @Param("endDate") LocalDateTime endDate,
+            @Param("personFrom") String personFrom,
+            @Param("province") String province,
+            @Param("realtyConsultant") String realtyConsultant,
+            @Param("realtyConsultantPhone") String realtyConsultantPhone,
+            @Param("activityId") String activityId,
+            @Param("activityType") String activityType
+    );
+
+    List<VisitPersonNum> selectActivityVisitPersonNumExport(
             @Param("orgId") Integer orgId,
             @Param("startDate") LocalDateTime startDate,
             @Param("endDate") LocalDateTime endDate,
@@ -143,4 +184,5 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultant") String realtyConsultant,
             @Param("realtyConsultantPhone") String realtyConsultantPhone
     );
+
 }

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

@@ -112,11 +112,11 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey);
     }
 
-    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String sort, String colKey){
+    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String sort, String colKey){
         IPage<SharePersonNum> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
 
-        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, sortType, colKey);
+        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, sortType, colKey);
         return ResponseBean.success(data);
     }
 
@@ -125,11 +125,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 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 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, sortType, colKey);
+        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, sortType, colKey);
         return ResponseBean.success(data);
     }
 
@@ -138,9 +138,9 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, sortType, colKey);
     }
 
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom){
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType){
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
-        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom);
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType);
         return ResponseBean.success(data);
     }
 
@@ -148,9 +148,23 @@ 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){
+    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){
         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);
+        IPage<VisitNum> data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType);
         return ResponseBean.success(data);
     }
+
+    public List<VisitNum> selectActivityVisitNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone){
+        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){
+        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);
+        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

@@ -10,7 +10,7 @@
         left join ta_drainage d on t.be_share = d.drainage_id
         left join ta_building_dynamic e on t.be_share = e.dynamic_id
         left join ta_person f on t.person_id = f.person_id
-        where t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and f.org_id = #{orgId}
+        where t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
         </if>
@@ -34,7 +34,7 @@
         left join ta_drainage d on t.be_share = d.drainage_id
         left join ta_building_dynamic e on t.be_share = e.dynamic_id
         left join ta_person f on t.person_id = f.person_id
-        where t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and f.org_id = #{orgId}
+        where t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
         </if>
@@ -118,7 +118,7 @@
         left join ta_building_dynamic e on t.be_share = e.dynamic_id
         left join ta_person f on t.person_id = f.person_id
         WHERE
-        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and f.org_id = #{orgId}
+        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
         </if>
@@ -375,7 +375,7 @@
         left join ta_building_dynamic e on t.be_share = e.dynamic_id
         left join ta_person f on t.person_id = f.person_id
         WHERE
-        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and f.org_id = #{orgId}
+        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
         </if>
@@ -395,7 +395,7 @@
         DATE_FORMAT( t.create_date, '%Y-%m-%d' )
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
         LEFT JOIN (
-            select COUNT(1) AS sharePersonNum, temp1.create_date from (
+            select temp1.sharePersonNum, temp1.create_date from (
                 SELECT COUNT( 1 ) AS sharePersonNum, t.create_date AS create_date, t.person_id
                 FROM
                 ta_share_count t
@@ -452,59 +452,61 @@
         DATE_FORMAT( t.visit_time, '%Y-%m-%d' )
         ) AS temp2 ON temp_date.date = DATE_FORMAT( temp2.create_date, '%Y-%m-%d' )
         LEFT JOIN (
-        SELECT
-        COUNT( 1 ) AS visitPersonNum,
-        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
+            select  count(*)AS visitPersonNum , 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' )
+            </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 visitPersonCount GROUP BY DATE_FORMAT(visitPersonCount.create_date, '%Y-%m-%d')
         ) AS temp3 ON temp_date.date = DATE_FORMAT( temp3.create_date, '%Y-%m-%d' )
         LEFT JOIN (
-        SELECT
-        COUNT( 1 ) AS addRegistNum ,
-        t.create_date AS create_date
-        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}
-        <if test="buildingId != null and buildingId != ''">
-            and t.building_id =  #{buildingId}
-        </if>
-        and t.status = 1
-        <if test="targetType != null and targetType != ''">
-            and t.target_type =  #{targetType}
-        </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>
-        <if test="startDate == null or endDate == null">
-            AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-        </if>
-        GROUP BY
-        DATE_FORMAT( t.create_date, '%Y-%m-%d' ) ,t.person_id, t.target_type
+        select count(*) as addRegistNum,temp4.* from (
+            SELECT
+            t.create_date AS create_date,
+            t.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}
+            <if test="buildingId != null and buildingId != ''">
+                and t.building_id =  #{buildingId}
+            </if>
+            and t.status = 1
+            <if test="targetType != null and targetType != ''">
+                and t.target_type =  #{targetType}
+            </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>
+            <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, t.target_type
+            ) as temp4 GROUP BY DATE_FORMAT(temp4.create_date,'%Y-%m-%d')
         ) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
-
         GROUP BY date
         <if test="colKey == null or colKey == ''">
             ORDER BY  date desc
@@ -541,7 +543,7 @@
         left join ta_building_dynamic e on t.be_share = e.dynamic_id
         left join ta_person f on t.person_id = f.person_id
         WHERE
-        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and f.org_id = #{orgId}
+        t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
         </if>
@@ -561,7 +563,7 @@
         DATE_FORMAT( t.create_date, '%Y-%m-%d' )
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
         LEFT JOIN (
-        select COUNT(1) AS sharePersonNum, temp1.create_date from (
+        select temp1.sharePersonNum, temp1.create_date from (
         SELECT COUNT( 1 ) AS sharePersonNum, t.create_date AS create_date, t.person_id
         FROM
         ta_share_count t
@@ -618,9 +620,10 @@
         DATE_FORMAT( t.visit_time, '%Y-%m-%d' )
         ) AS temp2 ON temp_date.date = DATE_FORMAT( temp2.create_date, '%Y-%m-%d' )
         LEFT JOIN (
+        select  count(*)AS visitPersonNum , visitPersonCount.* from (
         SELECT
-        COUNT( 1 ) AS visitPersonNum,
-        t.visit_time AS create_date
+        t.visit_time AS create_date,
+        t.person_id
         FROM
         ta_person_visit_record t
         WHERE
@@ -641,12 +644,14 @@
             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
+        DATE_FORMAT(t.visit_time, '%Y-%m-%d'),
+        person_id) as visitPersonCount GROUP BY DATE_FORMAT(visitPersonCount.create_date, '%Y-%m-%d')
         ) AS temp3 ON temp_date.date = DATE_FORMAT( temp3.create_date, '%Y-%m-%d' )
         LEFT JOIN (
+        select count(*) as addRegistNum,temp4.* from (
         SELECT
-        COUNT( 1 ) AS addRegistNum ,
-        t.create_date AS create_date
+        t.create_date AS create_date,
+        t.person_id
         FROM
         ta_share_person_from t
         WHERE
@@ -667,10 +672,9 @@
         <if test="startDate == null or endDate == null">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY
-        DATE_FORMAT( t.create_date, '%Y-%m-%d' ) ,t.person_id, t.target_type
+        GROUP BY t.person_id, t.target_type
+        ) as temp4 GROUP BY DATE_FORMAT(temp4.create_date,'%Y-%m-%d')
         ) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
-
         GROUP BY date
         <if test="colKey == null or colKey == ''">
             ORDER BY  date desc
@@ -1014,6 +1018,12 @@
             ON t.person_id = f.person_id
             WHERE t.tagert_type in ('activity','group','h5','help','liveApp','livePost') 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="activityId != null and activityId != ''">
+                and t.be_share = #{activityId}
+            </if>
+            <if test="activityType != null and activityType != ''">
+                and t.tagert_type = #{activityType}
+            </if>
             <if test="sharePersonType != null and sharePersonType != ''">
                 and f.person_type = #{sharePersonType}
             </if>
@@ -1150,7 +1160,11 @@
     </select>
 
     <select id="selectActivityShareNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.ShareNum">
-        select person.nickname as sharePersonName, ifnull(person.tel, '空') as sharePersonPhone , person.create_date as shareTime, ifnull(visitPersonNum.visitPersonNum, 0) as visitPersonNum, person.person_type as sharePersonType
+        select person.nickname as sharePersonName,
+        ifnull(person.tel, '空') as sharePersonPhone ,
+        person.create_date as shareTime,
+        ifnull(visitPersonNum.visitPersonNum, 0) as visitPersonNum,
+        person.person_type as sharePersonType
         FROM (
             SELECT t.*, f.nickname, f.tel, f.person_type
             FROM ta_share_count t
@@ -1167,7 +1181,13 @@
             LEFT JOIN ta_person f
             ON t.person_id = f.person_id
             WHERE t.tagert_type in ('activity','group','h5','help','liveApp','livePost')
-            and f.org_id = #{orgId}
+            <if test="activityId != null and activityId != ''">
+                and t.be_share = #{activityId}
+            </if>
+            <if test="activityType != null and activityType != ''">
+                and t.tagert_type = #{activityType}
+            </if>
+            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' )
         ) as person
@@ -1239,7 +1259,14 @@
         left join ta_person e on t.share_person = e.person_id
         left join ta_user 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
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
+        <if test="activityId != null and activityId != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.target_type = concat(#{activityType}, '_share')
+        </if>
         <if test="personFrom != null and personFrom != ''">
             and b.scene_id = #{personFrom}
         </if>
@@ -1271,38 +1298,224 @@
     </select>
 
     <select id="selectActivityVisitNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">
-        SELECT
+        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.visit_time as visitDate
+        From (
+            SELECT
+            t.person_id, t.visit_time
+            FROM
+            ta_person_visit_record t
+            WHERE
+            t.`event` = 'detail'
+            AND t.event_type IN (
+            'activity',
+            'help',
+            'group',
+            'h5'
+            )
+            <if test="activityId != null and activityId != ''">
+                and t.target_id = #{activityId}
+            </if>
+            <if test="activityType != null and activityType != ''">
+                and t.event_type = #{activityType}
+            </if>
+            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')
+        ) 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
+        <where>
+            <if test="personFrom != null and personFrom != ''">
+                and b.scene_id = #{personFrom}
+            </if>
+            <if test="province != null and province != ''">
+                and a.province = #{province}
+            </if>
+            <if test="realtyConsultant != null and realtyConsultant != ''">
+                and d.name = #{realtyConsultant}
+            </if>
+            <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
+                and d.phone = #{realtyConsultantPhone}
+            </if>
+        </where>
+        order by t.visit_time desc
+    </select>
+
+    <select id="selectActivityVisitNumExport" 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,
-        ifnull(e.nickname, f.user_name) as sharePersonName,
-        e.phone as sharePersonPhone,
-        t.create_date as visitDate
-        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 = 84 and b.is_first_time =1
+        t.visit_time as visitDate
+        From (
+        SELECT
+        t.person_id, t.visit_time
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        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')
+        ) 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 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
-        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.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d' )
-        <if test="personFrom != null and personFrom != ''">
-            and b.scene_id = #{personFrom}
-        </if>
-        <if test="province != null and province != ''">
-            and a.province = #{province}
-        </if>
-        <if test="realtyConsultant != null and realtyConsultant != ''">
-            and d.name = #{realtyConsultant}
-        </if>
-        <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
-            and d.phone = #{realtyConsultantPhone}
+        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
+        <where>
+            <if test="personFrom != null and personFrom != ''">
+                and b.scene_id = #{personFrom}
+            </if>
+            <if test="province != null and province != ''">
+                and a.province = #{province}
+            </if>
+            <if test="realtyConsultant != null and realtyConsultant != ''">
+                and d.name = #{realtyConsultant}
+            </if>
+            <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
+                and d.phone = #{realtyConsultantPhone}
+            </if>
+        </where>
+        order by t.visit_time desc
+    </select>
+
+    <select id="selectActivityVisitPersonNum" 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
+        t.visit_time AS create_date,
+        t.person_id,
+        count(*) as visitNum
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        AND t.org_id = 84
+        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 != ''">
+            and t.target_id = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.event_type = #{activityType}
         </if>
+        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
+        <where>
+            <if test="personFrom != null and personFrom != ''">
+                and b.scene_id = #{personFrom}
+            </if>
+            <if test="province != null and province != ''">
+                and a.province = #{province}
+            </if>
+            <if test="realtyConsultant != null and realtyConsultant != ''">
+                and d.name = #{realtyConsultant}
+            </if>
+            <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
+                and d.phone = #{realtyConsultantPhone}
+            </if>
+        </where>
+        order by t.create_date desc
+    </select>
+
+    <select id="selectActivityVisitPersonNumExport"
+            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
+        t.visit_time AS create_date,
+        t.person_id,
+        count(*) as visitNum
+        FROM
+        ta_person_visit_record t
+        WHERE
+        t.`event` = 'detail'
+        AND t.event_type IN (
+        'activity',
+        'help',
+        'group',
+        'h5'
+        )
+        AND t.org_id = 84
+        AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
+        AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
+        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
+        <where>
+            <if test="personFrom != null and personFrom != ''">
+                and b.scene_id = #{personFrom}
+            </if>
+            <if test="province != null and province != ''">
+                and a.province = #{province}
+            </if>
+            <if test="realtyConsultant != null and realtyConsultant != ''">
+                and d.name = #{realtyConsultant}
+            </if>
+            <if test="realtyConsultantPhone != null and realtyConsultantPhone != ''">
+                and d.phone = #{realtyConsultantPhone}
+            </if>
+        </where>
+        order by t.create_date desc
     </select>
 
 </mapper>