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

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

 package com.huiju.estateagents.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingReport;
 import com.huiju.estateagents.service.ITaBuildingReportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-import com.huiju.estateagents.base.BaseController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
      */
     @RequestMapping(value="/admin/taBuildingReports",method= RequestMethod.GET)
     public ResponseBean taBuildingReportList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                             @RequestParam(value ="pageSize",defaultValue = "20") Integer pageSize,
                                              HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {

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

         try {
             QueryWrapper<TdLiveDict> tdLiveDictQueryWrapper = new QueryWrapper<>();
             tdLiveDictQueryWrapper.eq("status", 1);
+            tdLiveDictQueryWrapper.orderByDesc("sort");
             List<TdLiveDict> tdLiveDictList = tdLiveDictService.list(tdLiveDictQueryWrapper);
             responseBean.addSuccess(tdLiveDictList);
         }catch (Exception e){

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

     List<TaPersonVisitRecord> selectData();
 
     List<TaPersonVisitRecord> selectTapersonFromShare();
+
+    Integer selectTodayVisitCount(@Param("orgId") Integer orgId,@Param("nowDate") LocalDateTime now);
 }

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

         Integer selectRecentlyCount = taPersonMapper.selectTodayRecentlyCount(orgId, LocalDateTime.now());
 
         // -------  用户来源 end ------------
+        //今日访问次数
+        Integer selectVisitCount = taPersonVisitRecordMapper.selectTodayVisitCount(orgId, LocalDateTime.now());
 
         map.put("selectUserCount", selectUserCount);
         map.put("selectRegisteredCount", selectRegisteredCount);
         map.put("selectRecentlyCount", selectRecentlyCount);
+        map.put("selectVisitCount", selectVisitCount);
 
         responseBean.addSuccess(map);
 

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

                                          @RequestParam(value = "buildingId", required = false)String buildingId,
                                          @RequestParam(value = "targetType", required = false)String targetType,
                                          HttpServletRequest request) {
-        return taActivityStaticService.activityStatistical(startDate, endDate, buildingId, targetType, getOrgId(request));
+        return taActivityStaticService.activityStatistical(startDate, endDate, buildingId, targetType, getOrgId(request), getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
                                             @RequestParam(value = "buildingId", required = false)String buildingId,
                                             @RequestParam(value = "targetType", required = false)String targetType,
                                             HttpServletRequest request) {
-        return taActivityStaticService.selectAllActivityUser(getOrgId(request), startDate, endDate, buildingId, targetType);
+        return taActivityStaticService.selectAllActivityUser(getOrgId(request), startDate, endDate, buildingId, targetType, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
                                             @RequestParam(value = "sort", required = false)String sort,
                                             @RequestParam(value = "colKey", required = false)String colKey,
                                             HttpServletRequest request) {
-        return taActivityStaticService.selectTableData(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey);
+        return taActivityStaticService.selectTableData(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
      * @return
      */
     @GetMapping(value = "/admin/activityStatistical/tableDataExport")
-    public void selectTableData(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+    public void selectTableDataExport(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
                                         @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                         @RequestParam(value = "buildingId", required = false)String buildingId,
                                         @RequestParam(value = "targetType", required = false)String targetType,
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), StatisicAttractUser.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<StatisicAttractUser> data = taActivityStaticService.selectExportTableData(getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey);
+        List<StatisicAttractUser> data = taActivityStaticService.selectExportTableData(getOrgId(request), startDate, endDate, buildingId, targetType, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
                                         @RequestParam(value = "sort", required = false)String sort,
                                         @RequestParam(value = "colKey", required = false)String colKey,
                                         HttpServletRequest request) {
-        return taActivityStaticService.selectActivityStatisDetail(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey);
+        return taActivityStaticService.selectActivityStatisDetail(pageNum, pageSize, getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ActivityDetailShareRecord.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<ActivityDetailShareRecord> data = taActivityStaticService.selectActivityStatisDetailExport(getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey);
+        List<ActivityDetailShareRecord> data = taActivityStaticService.selectActivityStatisDetailExport(getOrgId(request), startDate, endDate, buildingId, targetType, activityName, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
                                                    @RequestParam(value = "colKey", required = false)String colKey,
                                                    @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), SharePersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
+        List<SharePersonNum> data = taActivityStaticService.selectActivitySharePersonNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
                                                      @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate endDate,
                                                      @RequestParam(value = "sharePersonType", required = false)String sharePersonType,
                                                      @RequestParam(value = "sharePersonName", required = false)  String sharePersonName,
-                                                     @RequestParam(value = "sharePhone", required = false)String sharePhone,
+                                                     @RequestParam(value = "sharePersonPhone", required = false)String sharePersonPhone,
                                                      @RequestParam(value = "activityId", required = false)String activityId,
                                                      @RequestParam(value = "activityType", required = false)String activityType,
                                                      @RequestParam(value = "personId", required = false)String personId,
                                                      @RequestParam(value = "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, personId, buildingId, sort, colKey);
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePersonPhone, activityId, activityType, personId, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), ShareNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey);
+        List<ShareNum> data = taActivityStaticService.selectActivityShareNumExport(getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();
                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId);
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
     }
 
     /**
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId);
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

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

 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
 @Mapper
 public interface TaActicityStaticMapper {
-    Integer selectSharePersonNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
 
-    Integer selectShareNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime 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,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId);
+
+    Integer selectShareNum(@Param("startDate") LocalDateTime startDate,
+                           @Param("endDate") LocalDateTime endDate,
+                           @Param("buildingId") String buildingId,
+                           @Param("targetType") String targetType,
+                           @Param("orgId") Integer orgId,
+                           @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                           @Param("userId") Integer userId);
 
-    Integer selectVisitPersonNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
+    Integer selectVisitPersonNum(@Param("startDate") LocalDateTime startDate,
+                                 @Param("endDate") LocalDateTime endDate,
+                                 @Param("buildingId") String buildingId,
+                                 @Param("targetType") String targetType,
+                                 @Param("orgId") Integer orgId,
+                                 @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                                 @Param("userId") Integer userId);
 
-    Integer selectVisitNum(@Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType, @Param("orgId") Integer orgId);
+    Integer selectVisitNum(@Param("startDate") LocalDateTime startDate,
+                           @Param("endDate") LocalDateTime endDate,
+                           @Param("buildingId") String buildingId,
+                           @Param("targetType") String targetType,
+                           @Param("orgId") Integer orgId,
+                           @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                           @Param("userId") Integer userId);
 
-    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectShareCount(@Param("orgId") Integer orgId,
+                                               @Param("startDate") LocalDateTime startDate,
+                                               @Param("endDate") LocalDateTime endDate,
+                                               @Param("buildingId") String buildingId,
+                                               @Param("targetType") String targetType,
+                                               @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                                               @Param("userId") Integer userId );
 
-    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
+    List<Map<String, Object>> selectSharePersonCount(@Param("orgId") Integer orgId,
+                                                     @Param("startDate") LocalDateTime startDate,
+                                                     @Param("endDate") LocalDateTime endDate,
+                                                     @Param("buildingId") String buildingId,
+                                                     @Param("targetType") String targetType,
+                                                     @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+                                                     @Param("userId") Integer userId);
 
     List<Map<String, Object>> selectVisitCount(@Param("orgId") Integer orgId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate, @Param("buildingId") String buildingId, @Param("targetType") String targetType);
 
             @Param("buildingId") String buildingId,
             @Param("targetType") String targetType,
             @Param("sortType") String sortType,
-            @Param("colKey") String colKey );
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId );
 
     List<StatisicAttractUser> selectExportTableData(
             @Param("orgId") Integer orgId,
             @Param("buildingId") String buildingId,
             @Param("targetType") String targetType,
             @Param("sortType") String sortType,
-            @Param("colKey") String colKey );
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId );
 
     IPage<ActivityDetailShareRecord> selectActivityStatisDetail(
             IPage<ActivityDetailShareRecord> attractUserIPage,
             @Param("targetType") String targetType,
             @Param("activityName") String activityName,
             @Param("sortType") String sortType,
-            @Param("colKey") String colKey
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     List<ActivityDetailShareRecord> selectActivityStatisDetailExport(
             @Param("targetType") String targetType,
             @Param("activityName") String activityName,
             @Param("sortType") String sortType,
-            @Param("colKey") String colKey
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     IPage<SharePersonNum> selectActivitySharePersonNum(
             @Param("activityType") String activityType,
             @Param("buildingId") String buildingId,
             @Param("sort") String sort,
-            @Param("colKey") String colKey
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     List<SharePersonNum> selectActivitySharePersonNumExport(
             @Param("activityType") String activityType,
             @Param("buildingId") String buildingId,
             @Param("sort") String sort,
-            @Param("colKey") String colKey
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     IPage<ShareNum> selectActivityShareNum(
             @Param("personId") String personId,
             @Param("buildingId") String buildingId,
             @Param("sort") String sort,
-            @Param("colKey") String colKey
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     List<ShareNum> selectActivityShareNumExport(
             @Param("personId") String personId,
             @Param("buildingId") String buildingId,
             @Param("sort") String sort,
-            @Param("colKey") String colKey
+            @Param("colKey") String colKey,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     IPage<AddRegistNum> selectActivityAddRegistNum(
             @Param("personFrom") String personFrom,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     List<AddRegistNum> selectActivityAddRegistNumExport(
             @Param("personFrom") String personFrom,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
+            @Param("userId") Integer userId
     );
 
     IPage<VisitNum> selectActivityVisitNum(
             @Param("buildingId") String buildingId
     );
 
-    List<VisitPersonNum> selectActivityVisitPersonNumByPersonIdExport(
-            @Param("orgId") Integer orgId,
-            @Param("startDate") LocalDateTime startDate,
-            @Param("endDate") LocalDateTime endDate,
-            @Param("personFrom") String personFrom,
-            @Param("province") String province,
-            @Param("realtyConsultant") String realtyConsultant,
-            @Param("realtyConsultantPhone") String realtyConsultantPhone,
-            @Param("activityId") String activityId,
-            @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId,
-            @Param("personId") String personId
-    );
-
     IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
             IPage<VisitPersonNum> iPage,
             @Param("orgId") Integer orgId,

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

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
 import org.springframework.beans.factory.annotation.Autowired;
     @Autowired
     private TaActicityStaticMapper taActicityStaticMapper;
 
-    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId){
+    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
 
         ResponseBean responseBean = new ResponseBean();
         Map<String, Object> map = new HashMap<>();
 
-        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
+        Integer sharePersonNum = taActicityStaticMapper.selectSharePersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
 
-        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
+        Integer shareNum = taActicityStaticMapper.selectShareNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
 
-        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
+        Integer visitPersonNum = taActicityStaticMapper.selectVisitPersonNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
 
-        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId);
+        Integer visitNum = taActicityStaticMapper.selectVisitNum(LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), building, targetType, orgId, taPersonBuildings, userId);
 
         map.put("sharePersonNum", sharePersonNum);
         map.put("shareNum", shareNum);
         return responseBean;
     }
 
-    public ResponseBean selectAllActivityUser(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType){
+    public ResponseBean selectAllActivityUser(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         ResponseBean responseBean = new ResponseBean();
 
         // 新增用户数
-        List<Map<String, Object>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
-        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>> selectShareCount = taActicityStaticMapper.selectShareCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
+        List<Map<String, Object>> selectSharePersonCount = taActicityStaticMapper.selectSharePersonCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, taPersonBuildings, userId);
         List<Map<String, Object>> selectVisitCount = taActicityStaticMapper.selectVisitCount(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType);
         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);
         return responseBean;
     }
 
-    public ResponseBean selectTableData(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey){
+    public ResponseBean selectTableData(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         IPage<StatisicAttractUser> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey);
+        IPage<StatisicAttractUser> data = taActicityStaticMapper.selectTableData(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<StatisicAttractUser> selectExportTableData(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey){
+    public List<StatisicAttractUser> selectExportTableData(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectExportTableData(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey);
+        return taActicityStaticMapper.selectExportTableData(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, sortType, colKey, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityStatisDetail(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey){
+    public ResponseBean selectActivityStatisDetail(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         IPage<ActivityDetailShareRecord> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, activityName, sortType, colKey);
+        IPage<ActivityDetailShareRecord> data = taActicityStaticMapper.selectActivityStatisDetail(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX.withNano(0)), buildingId, targetType, activityName, sortType, colKey, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<ActivityDetailShareRecord> selectActivityStatisDetailExport(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey){
+    public List<ActivityDetailShareRecord> selectActivityStatisDetailExport(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, String targetType, String activityName, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey);
+        return taActicityStaticMapper.selectActivityStatisDetailExport(orgId, startDate, endDate, buildingId, targetType, activityName, sortType, colKey, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey){
+    public ResponseBean selectActivitySharePersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         IPage<SharePersonNum> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
 
-        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey);
+        IPage<SharePersonNum> data = taActicityStaticMapper.selectActivitySharePersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<SharePersonNum> selectActivitySharePersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey){
+    public List<SharePersonNum> selectActivitySharePersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey);
+        return taActicityStaticMapper.selectActivitySharePersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sortType, colKey, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey){
+    public ResponseBean selectActivityShareNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         IPage<ShareNum> iPage = new Page<>(pageNum, pageSize);
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
 
-        IPage<ShareNum> data = taActicityStaticMapper.selectActivityShareNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, 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, buildingId, sortType, colKey, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<ShareNum> selectActivityShareNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey){
+    public List<ShareNum> selectActivityShareNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String sharePersonType, String sharePersonName, String sharePhone, String activityId, String activityType, String personId, String buildingId, String sort, String colKey, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         String sortType = "ascend".equals(sort) ? "asc" : "desc";
-        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey);
+        return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId){
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
         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, activityId, activityType, buildingId);
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
         return ResponseBean.success(data);
     }
 
-    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId){
-        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId);
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
     }
 
     public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

             t.target_id, t.event_type;
     </select>
 
+    <select id="selectTodayVisitCount" resultType="java.lang.Integer">
+        SELECT
+        COUNT(1) as visit_count
+        FROM
+        ta_person_visit_record tp
+        where tp.org_id = #{orgId} AND
+        tp.event  = 'start'
+        AND DATE_FORMAT(tp.visit_time,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
+
 
 </mapper>