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

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

@@ -179,6 +179,16 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectCityUser(orgId);
     }
 
+    /**
+     * 人员分布城市比例
+     * @return
+     */
+    @GetMapping(value = "/admin/selectCityPerson")
+    public ResponseBean selectCityPerson(HttpServletRequest request) {
+        Integer orgId = getOrgId(request);
+        return iStatisticalService.selectCityPerson(orgId);
+    }
+
     /**
      * 意向用户  首页
      * @return

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

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

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.excel.ActivityStatistics;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
@@ -7,6 +8,7 @@ import lombok.Data;
 @Data
 public class ActivityDetailShareRecord {
 
+    @ExcelIgnore
     private String activityId;
 
     /**

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.excel.ActivityStatistics;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
@@ -42,4 +43,7 @@ public class ShareNum {
     @ColumnWidth(15)
     @ExcelProperty(value = "访问人数", index = 4)
     private Integer visitPersonNum;
+
+    @ExcelIgnore
+    private String sharePersonId;
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.excel.ActivityStatistics;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.alibaba.excel.annotation.write.style.ColumnWidth;
 import lombok.Data;
@@ -48,4 +49,6 @@ public class SharePersonNum {
     @ExcelProperty(value = "访问次数", index = 5)
     private Integer visitNum;
 
+    @ExcelIgnore
+    private String personId;
 }

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

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

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

@@ -72,4 +72,18 @@ public class PublicCustomerExport {
     @ColumnWidth(15)
     @ExcelProperty(value = "项目名称", index = 3)
     private String buildingName;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "推广人员", index = 8)
+    private String sharePersonName ;
+
+    /**
+     * 意向度
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "积分值", index = 9)
+    private String points ;
 }

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

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

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

@@ -254,4 +254,6 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
+
+    List<Map<String, Object>> selectCityPerson(@Param("orgId") Integer orgId);
 }

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

@@ -215,4 +215,11 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 人员城市分布
+     * @param orgId
+     * @return
+     */
+    ResponseBean selectCityPerson(Integer orgId);
 }

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

@@ -579,6 +579,24 @@ public class StatisticalServiceImpl implements IStatisticalService {
         return ResponseBean.success(tableList);
     }
 
+    /**
+     * 人员城市分布
+     *
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean selectCityPerson(Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 城市比例
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityPerson(orgId);
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectCityUser", selectCityUser);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
     /**
      * 项目公客排行折线图获取
      * @param orgId

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

@@ -71,7 +71,6 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
             taBuildingDynamicQuery.eq("dynamic_id",id);
             TaBuildingDynamic taBuildingDynamic = taBuildingDynamicMapper.selectOne(taBuildingDynamicQuery);
             taBuildingDynamicMapper.updateById( taBuildingDynamic.setShareNum(taBuildingDynamic.getShareNum() == null ? 1:taBuildingDynamic.getShareNum()+1));
-//            return ResponseBean.success("成功");
         }
 
         TaShareCount taShareCount = new TaShareCount();

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

@@ -148,8 +148,9 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "activityType", required = false)String activityType,
                                                    @RequestParam(value = "sort", required = false)String sort,
                                                    @RequestParam(value = "colKey", required = false)String colKey,
+                                                   @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, sort, colKey);
+        return taActivityStaticService.selectActivitySharePersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, buildingId, sort, colKey);
     }
 
     /**
@@ -190,10 +191,12 @@ 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 = "buildingId", required = false)String buildingId,
                                                      @RequestParam(value = "sort", required = false)String sort,
                                                      @RequestParam(value = "colKey", required = false)String colKey,
                                                      HttpServletRequest request) {
-        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, sort, colKey);
+        return taActivityStaticService.selectActivityShareNum(pageNum, pageSize, getOrgId(request), startDate, endDate, sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sort, colKey);
     }
 
     /**
@@ -271,8 +274,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 +315,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 +345,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,
@@ -82,6 +82,7 @@ public interface TaActicityStaticMapper {
             @Param("sharePhone") String sharePhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
+            @Param("buildingId") String buildingId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -107,6 +108,8 @@ public interface TaActicityStaticMapper {
             @Param("sharePhone") String sharePhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
+            @Param("personId") String personId,
+            @Param("buildingId") String buildingId,
             @Param("sort") String sort,
             @Param("colKey") String colKey
     );
@@ -185,4 +188,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;
@@ -20,18 +21,18 @@ public class TaActivityStaticServiceImpl {
     @Autowired
     private TaActicityStaticMapper taActicityStaticMapper;
 
-    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String buidling, String targetType, Integer orgId){
+    public ResponseBean activityStatistical(LocalDate startDate, LocalDate endDate, String building, String targetType, Integer orgId){
 
         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.withNano(0)), building, 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.withNano(0)), building, 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.withNano(0)), building, 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.withNano(0)), building, 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);
     }
 
@@ -112,11 +113,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 activityId, String activityType, 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){
         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, 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);
         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 buildingId, 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, buildingId, 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/TaOrgCity.xml

@@ -23,4 +23,15 @@
                 ORDER BY
                 c.pinyin
     </select>
+    <select id="selectAdminTdAreaCityList" resultType="com.huiju.estateagents.entity.TaOrgCity">
+        SELECT
+        id,
+        NAME,
+        parentid,
+        LEFT ( pinyin, 1 ) AS initial
+        FROM
+        td_city
+        WHERE
+        parentid = #{cityId}
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -615,6 +615,32 @@ FROM
         AND DATE_FORMAT(tp.create_date,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
     </select>
 
+    <select id="selectCityPerson" resultType="java.util.Map">
+        SELECT
+            d.*,
+            count( d.person_id ) AS cityCount
+        FROM
+        (
+            SELECT
+                t.city AS city,
+                b.shortname AS NAME,
+                b.lng,
+                b.lat,
+                t.person_id
+            FROM
+            ( SELECT * FROM ta_person_position ORDER BY create_time DESC ) t
+                LEFT JOIN ta_person a ON t.person_id = a.person_id
+                INNER JOIN td_city b ON t.citycode = b.citycode
+            WHERE
+                a.org_id = #{orgId}
+                AND a.person_type IN ( 'customer', 'drift', 'estate agent' )
+            GROUP BY
+                t.person_id
+        ) d
+        GROUP BY
+        d.city
+    </select>
+
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position
         <trim prefix="(" suffix=")" suffixOverrides=",">

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -551,11 +551,15 @@ FROM
           concat(b.country, b.province) as province,
           z.intention,
           d.scene_alias as sceneType,
-          t.building_name
+          t.building_name,
+          ifnull( c.nickname, c.NAME ) AS sharePersonName ,
+          s.points
         FROM
         ta_person b
         LEFT JOIN ta_person_from_record r ON b.person_id = r.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
         left join ta_building t on b.building_id = t.building_id
+        LEFT JOIN ta_person c ON b.recommend_person = c.person_id AND c.org_id = #{orgId}
+        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY person_id) s on b.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = b.person_id
         left join td_wx_dict d on r.scene_id = d.scene_id
         <where>
@@ -591,7 +595,7 @@ FROM
             <if test="consultTel != null and consultTel !=''">
                 and b.tel like CONCAT('%',#{consultTel}, '%')
             </if>
-            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)
+<!--            and NOT EXISTS ( select * from ta_recommend_customer a where a.org_id = #{orgId} and a.recommend_person = b.person_id)-->
             AND b.person_id not IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id is not null AND person_id != ''  )
         </where>
         order by b.create_date desc
@@ -667,15 +671,18 @@ FROM
         z.intention,
         a.create_date,
         concat(a.country,a.province) as province,
-        w.scene_alias as scene_type
+        w.scene_alias as scene_type,
+        IFNULL( c.NAME, c.nickname ) AS sharePersonName,
+        s.points
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person c ON a.realty_consultant = c.user_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1 and p.org_id = #{orgId}
+        LEFT JOIN ta_person c ON p.share_person_id = c.person_id
         left join ta_building t on a.building_id = t.building_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
+        left JOIN (select sum(points_amount) as points,person_id from ta_points_records where org_id = #{orgId} GROUP BY person_id) s on a.person_id = s.person_id
         left join (select sum(t.intention) as intention,t.person_id From ta_person_intention_record t where t.org_id = #{orgId} group by t.person_id) z on z.person_id = a.person_id
         <where>
             a.status > 0