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

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

@@ -1,14 +1,27 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.excel.IntentionUser;
+import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
+import com.huiju.estateagents.excel.handler.CustomCellWriteHandler;
 import com.huiju.estateagents.service.IStatisticalService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.time.LocalDate;
+import java.util.List;
 
 /**
  * 数据统计
@@ -52,6 +65,17 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectNewsUserCount(getOrgId(request), startDate, endDate);
     }
 
+    /**
+     * 新增用户数
+     * @return
+     */
+    @GetMapping(value = "/admin/changeNewsUserCount")
+    public ResponseBean changeNewsUserCount(@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,
+                                            HttpServletRequest request) {
+        return iStatisticalService.changeNewsUserCount(getOrgId(request), startDate, endDate);
+    }
+
     /**
      * 转化率 统计
      * @return
@@ -163,6 +187,25 @@ public class StatisticalController extends BaseController {
         return iStatisticalService.selectIntentionUser(pageNum, pageSize, getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
     }
 
+    /**
+     * 意向用户 导出
+     * @return
+     */
+    @GetMapping(value = "/admin/exportIntentionUser")
+    public void getBuildingTimeTableList(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                         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(), IntentionUser.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目详情统计").build();
+        List<IntentionUser> list = iStatisticalService.getExportIntentionUser(getOrgId(request), buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
     /**
      * 用户来源  首页
      * @return
@@ -184,4 +227,103 @@ public class StatisticalController extends BaseController {
                                          HttpServletRequest request) {
         return iStatisticalService.selectPersonFromGroupByDay(getOrgId(request), startDate,endDate);
     }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/barList")
+    public ResponseBean selectBuildingBar(@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,
+                                           HttpServletRequest request) {
+        return iStatisticalService.getStatsBarList(getOrgId(request), startDate, endDate, getTaPersonBuildingListByUserId(request));
+    }
+
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/tableList")
+    public ResponseBean selectBuildingTableList(@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 = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "sortField", required = false) String sortField,
+                                                @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                HttpServletRequest request) {
+        return iStatisticalService.getStatsTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/buildingExport")
+    public void getBuildingTableList(@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,
+                                             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(), StatsBuilding.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目统计").build();
+        List<StatsBuilding> list = iStatisticalService.getExportTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/timeBarList")
+    public ResponseBean selectBuildingTimeBar(@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,
+                                          HttpServletRequest request) {
+        return iStatisticalService.getStatsTimeBarList(getOrgId(request), startDate, endDate, buildingId, getTaPersonBuildingListByUserId(request));
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/timeTableList")
+    public ResponseBean selectBuildingTimeTableList(@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 = "buildingId", required = false) String buildingId,
+                                                @RequestParam(value = "sortField", required = false) String sortField,
+                                                @RequestParam(value = "sortOrder", required = false) String sortOrder,
+                                                HttpServletRequest request) {
+        return iStatisticalService.getStatsTimeTableList(pageNum,pageSize,getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request),sortField,sortOrder);
+    }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/buildingTimeExport")
+    public void getBuildingTimeTableList(@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,
+                                     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(), StatsTimeBuilding.class).registerWriteHandler(new CustomCellWriteHandler()).build();
+        // 设置 sheet, 同一个sheet只需要设置一次
+        WriteSheet writeSheet = EasyExcel.writerSheet("项目详情统计").build();
+        List<StatsTimeBuilding> list = iStatisticalService.getExportTimeTableList(getOrgId(request), startDate, endDate,buildingId, getTaPersonBuildingListByUserId(request));
+        excelWriter.write(list, writeSheet);
+        // finish 会帮忙关闭流
+        excelWriter.finish();
+    }
+
 }

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

@@ -2,9 +2,9 @@ package com.huiju.estateagents.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaOrg;
@@ -14,24 +14,19 @@ import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
-import com.huiju.estateagents.service.ITdCityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
-import com.huiju.estateagents.base.BaseController;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

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

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class IntentionUser {
+
+    /**
+     * 用户姓名
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "用户姓名", index = 0)
+    private String personName;
+
+    /**
+     * 手机号
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "手机号", index = 1)
+    private String phone;
+
+    /**
+     * 意向楼盘
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向楼盘", index = 2)
+    private String buildingName;
+
+    /**
+     * 意向值
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "意向值", index = 3)
+    private Integer intention;
+
+}

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

@@ -0,0 +1,61 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class StatsBuilding {
+
+    /**
+     * 项目名称
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "项目名称", index = 0)
+    private String buildingName;
+
+    /**
+     * 新增客户 公客加私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增客户", index = 1)
+    private Integer khNum;
+
+    /**
+     * 公客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公客", index = 2)
+    private Integer gkNum;
+
+    /**
+     * 私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "私客", index = 3)
+    private Integer skNum;
+
+    /**
+     * 观看人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer uvNum;
+
+    /**
+     * 观看次数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问次数", index = 5)
+    private Integer pvNum;
+
+
+    @ExcelIgnore
+    private String buildingId;
+
+
+
+
+
+}

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

@@ -0,0 +1,52 @@
+package com.huiju.estateagents.excel;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import lombok.Data;
+
+@Data
+public class StatsTimeBuilding {
+
+    /**
+     * 日期
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "日期", index = 0)
+    private String createDate;
+
+    /**
+     * 新增客户 公客加私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "新增客户", index = 1)
+    private Integer khNum;
+
+    /**
+     * 公客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "公客", index = 2)
+    private Integer gkNum;
+
+    /**
+     * 私客
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "私客", index = 3)
+    private Integer skNum;
+
+    /**
+     * 观看人数
+     */
+    @ColumnWidth(15)
+    @ExcelProperty(value = "访问人数", index = 4)
+    private Integer uvNum;
+
+    @ExcelIgnore
+    private String buildingId;
+
+
+
+
+}

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

@@ -1,13 +1,16 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaBuilding;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -93,4 +96,89 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
     int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
 
     List<TaBuilding> selectMainBuildings(@Param("cityId") String cityId, @Param("orgId") Integer orgId);
+
+    /**
+     * 获取公客统计图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getGkBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取私客统计图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getSkBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 项目访问人数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getWgBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 项目访问次数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getFwBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取项目统计列表数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    IPage<StatsBuilding> getStatsTableList(IPage<StatsBuilding> page, @Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("sortField") String sortField,@Param("orderType") String orderType);
+
+    /**
+     * 获取导出的数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    List<StatsBuilding> getExportTableList(@Param("orgId") Integer orgId, @Param("startDate")  LocalDate startDate, @Param("endDate")  LocalDate endDate, @Param("buildingId") String buildingId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    /**
+     * 获取单独building的折线图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @return
+     */
+    List<StatsTimeBuilding> getStatsTimeBarList(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId);
+
+    /**
+     * 获取详情数据表格
+     * @param pg
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param sortField
+     * @param orderType
+     * @return
+     */
+    IPage<StatsTimeBuilding> getStatsTimeTableList(IPage<StatsTimeBuilding> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId,@Param("sortField") String sortField,@Param("orderType") String orderType);
 }

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
+import com.huiju.estateagents.excel.IntentionUser;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -35,4 +36,6 @@ public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntent
                                                    @Param("orgId") Integer orgId,
                                                    @Param("buildingId") String buildingId,
                                                    @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+
+    List<IntentionUser> selectExportIntentionUser(@Param("orgId") Integer orgId,@Param("buildingId") String buildingId,@Param("personBuildingList") List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -1,17 +1,15 @@
 package com.huiju.estateagents.mapper;
 
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaChannel;
 import com.huiju.estateagents.entity.TaPerson;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaPersonPositon;
 import com.huiju.estateagents.po.PersonPO;
-import io.swagger.models.auth.In;
 import org.apache.ibatis.annotations.*;
 
-import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.Date;
+import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
 
@@ -249,4 +247,11 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @return
      */
     Integer savePersonPosition(TaPersonPositon record);
+
+    /**
+     * 今日新增人数
+     * @param orgId
+     * @return
+     */
+    Integer selectTodayRecentlyCount(@Param("orgId") Integer orgId, @Param("nowDate") LocalDateTime nowDate);
 }

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

@@ -2,9 +2,11 @@ package com.huiju.estateagents.service;
 
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.excel.IntentionUser;
+import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -126,4 +128,91 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 获取楼盘的折线图统计
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsBarList(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 获取楼盘统计所有数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId,String sortField,String sortOrder);
+
+    /**
+     * 获取需要导出的数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 按时间获取此楼盘的数据折线图
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsTimeBarList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 分页统计楼盘详情数据
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @param sortField
+     * @param sortOrder
+     * @return
+     */
+    ResponseBean getStatsTimeTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, String sortField, String sortOrder);
+
+    /**
+     * 项目详情统计
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<StatsTimeBuilding> getExportTimeTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 意向客户导出
+     * @param orgId
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    List<IntentionUser> getExportIntentionUser(Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId);
+
+    /**
+     * 新调整--新增用户
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate);
 }

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

@@ -1,8 +1,8 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 

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

@@ -8,7 +8,9 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
-import com.huiju.estateagents.exception.EstaException;
+import com.huiju.estateagents.excel.IntentionUser;
+import com.huiju.estateagents.excel.StatsBuilding;
+import com.huiju.estateagents.excel.StatsTimeBuilding;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
@@ -22,7 +24,10 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -71,8 +76,8 @@ public class StatisticalServiceImpl implements IStatisticalService {
         // 注册数
         Integer selectRegisteredCount = taPersonMapper.selectRegisteredCount(orgId);
 
-        // 最近七天
-        Integer selectRecentlyCount = taPersonMapper.selectRecentlyCount(orgId, CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+        // 最近七天--> 调整为今日新增
+        Integer selectRecentlyCount = taPersonMapper.selectTodayRecentlyCount(orgId, LocalDateTime.now());
 
         // -------  用户来源 end ------------
 
@@ -402,4 +407,260 @@ public class StatisticalServiceImpl implements IStatisticalService {
         });
         return dataList;
     }
+
+    /**
+     * 获取楼盘的折线图统计
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsBarList(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        //项目公客排行折线图获取
+        Map<String,Object> gkBarMap = getGkBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("gkBarMap",gkBarMap);
+
+        //项目私客排行折线图获取
+        Map<String,Object> skBarMap = getSkBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("skBarMap",skBarMap);
+
+        //项目访问人数排行折线图获取
+        Map<String,Object> wgBarMap = getWgBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("wgBarMap",wgBarMap);
+
+        //项目访问次数排行折线图获取
+        Map<String,Object> fwBarMap = getFwBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("fwBarMap",fwBarMap);
+
+        return ResponseBean.success(map);
+    }
+
+    /**
+     * 获取楼盘统计所有数据
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList,String sortField,String sortOrder) {
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        IPage<StatsBuilding> pg = new Page<>(pageNum, pageSize);
+        IPage<StatsBuilding> page = taBuildingMapper.getStatsTableList(pg, orgId, startDate, endDate, buildingId, personBuildingList,sortField,orderType);
+        return ResponseBean.success(page);
+    }
+
+    /**
+     * 获取需要导出的数据
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public List<StatsBuilding> getExportTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> personBuildingList) {
+        return taBuildingMapper.getExportTableList(orgId, startDate, endDate, buildingId, personBuildingList);
+    }
+
+    /**
+     * 按时间获取此楼盘的数据折线图
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTimeBarList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        Map<String,Object> map = new HashMap<>();
+        List<StatsTimeBuilding> list = taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId);
+        //日期维度
+        List<String> timeList = list.stream().map(StatsTimeBuilding::getCreateDate).collect(Collectors.toList());
+        //公客维度
+        List<Integer> gkList = list.stream().map(StatsTimeBuilding::getGkNum).collect(Collectors.toList());
+        //私客维度
+        List<Integer> skList = list.stream().map(StatsTimeBuilding::getSkNum).collect(Collectors.toList());
+        //新增客户维度
+        List<Integer> khList = list.stream().map(StatsTimeBuilding::getKhNum).collect(Collectors.toList());
+        //访问人数维度
+        List<Integer> uvList = list.stream().map(StatsTimeBuilding::getUvNum).collect(Collectors.toList());
+        map.put("list",list);
+        map.put("timeList",timeList);
+        map.put("gkList",gkList);
+        map.put("skList",skList);
+        map.put("khList",khList);
+        map.put("uvList",uvList);
+        return ResponseBean.success(map);
+    }
+
+    /**
+     * 分页统计楼盘详情数据
+     *
+     * @param pageNum
+     * @param pageSize
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @param sortField
+     * @param sortOrder
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsTimeTableList(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId, String sortField, String sortOrder) {
+        String orderType = "asc";
+        if ("descend".equals(sortOrder)){
+            orderType = "desc";
+        }else if ("ascend".equals(sortOrder)){
+            orderType = "asc";
+        }
+        IPage<StatsTimeBuilding> pg = new Page<>(pageNum, pageSize);
+        IPage<StatsTimeBuilding> page = taBuildingMapper.getStatsTimeTableList(pg, orgId, startDate, endDate, buildingId,sortField,orderType);
+        return ResponseBean.success(page);
+    }
+
+    /**
+     * 项目详情统计
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<StatsTimeBuilding> getExportTimeTableList(Integer orgId, LocalDate startDate, LocalDate endDate, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taBuildingMapper.getStatsTimeBarList(orgId,startDate,endDate,buildingId);
+    }
+
+    /**
+     * 意向客户导出
+     *
+     * @param orgId
+     * @param buildingId
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    @Override
+    public List<IntentionUser> getExportIntentionUser(Integer orgId, String buildingId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taPersonIntentionRecordMapper.selectExportIntentionUser(orgId, buildingId, taPersonBuildingListByUserId);
+    }
+
+    /**
+     * 新调整--新增用户
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    @Override
+    public ResponseBean changeNewsUserCount(Integer orgId, LocalDate startDate, LocalDate endDate) {
+        List<TsPersonFromStatistic> tableList = tsPersonFromStatisticMapper.selectNewLinePersonFromGroupByData(orgId, startDate, endDate);
+        return ResponseBean.success(tableList);
+    }
+
+    /**
+     * 项目公客排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getGkBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> gkBarData = taBuildingMapper.getGkBarData(orgId, startDate, endDate, personBuildingList);
+        if (gkBarData.size() > 0){
+            map.put("data",gkBarData);
+            List<Object> buildingNameList = gkBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = gkBarData.stream().map(x -> x.get("gkNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
+
+    /**
+     * 项目私客排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getSkBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> skBarData = taBuildingMapper.getSkBarData(orgId, startDate, endDate, personBuildingList);
+        if (skBarData.size() > 0){
+            map.put("data",skBarData);
+            List<Object> buildingNameList = skBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = skBarData.stream().map(x -> x.get("skNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
+
+
+    /**
+     * 项目访问人数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getWgBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> wgBarData = taBuildingMapper.getWgBarData(orgId, startDate, endDate, personBuildingList);
+        if (wgBarData.size() > 0){
+            map.put("data",wgBarData);
+            List<Object> buildingNameList = wgBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = wgBarData.stream().map(x -> x.get("wgNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
+
+    /**
+     * 项目访问次数排行折线图获取
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    private Map<String, Object> getFwBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> fwBarData = taBuildingMapper.getFwBarData(orgId, startDate, endDate, personBuildingList);
+        if (fwBarData.size() > 0){
+            map.put("data",fwBarData);
+            List<Object> buildingNameList = fwBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = fwBarData.stream().map(x -> x.get("pvNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
 }

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

@@ -6,18 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import javafx.scene.control.Tab;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

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

@@ -28,4 +28,6 @@ public interface TsPersonFromStatisticMapper extends BaseMapper<TsPersonFromStat
     List<TsPersonFromStatistic> selectPersonFromGroupByData(@Param("orgId") Integer orgId, @Param("startDate") LocalDate startDate, @Param("endDate") LocalDate endDate);
 
     void deleteByData();
+
+    List<TsPersonFromStatistic> selectNewLinePersonFromGroupByData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 }

src/main/resources/mapper/TaBuildingMapper.xml

@@ -257,4 +257,478 @@
         ORDER BY t.order_no desc
     </select>
 
+    <select id="getGkBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS gk_num,
+            bb.building_id,
+            bb.create_date,
+            bb.building_name
+        FROM
+        (
+            SELECT
+                b.*,
+                d.building_name
+            FROM
+                ta_person b
+            LEFT JOIN ta_building d ON b.building_id = d.building_id
+            WHERE
+                b.STATUS > 0
+                AND b.org_id = #{orgId}
+                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+                <if test="personBuildingList != null and personBuildingList.size > 0">
+                    AND b.building_id in
+                    <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                        #{personBuilding.buildingId}
+                    </foreach>
+                </if>
+                <if test="startDate != null">
+                    and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+                and b.building_id is not null
+            GROUP BY
+            b.person_id
+        ) bb
+        GROUP BY
+            bb.building_id
+        order by gk_num desc
+        limit 6
+    </select>
+
+    <select id="getSkBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS sk_num,
+            a.building_id,
+            d.building_name
+        FROM
+            ta_recommend_customer a
+        LEFT JOIN ta_building d ON a.building_id = d.building_id
+        WHERE
+            a.STATUS > 0
+            AND a.verify_status = 1
+            AND a.realty_consultant IS NOT NULL
+            AND a.realty_consultant != ''
+            AND a.org_id = #{orgId}
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            <if test="startDate != null">
+                and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
+        GROUP BY
+        a.building_id
+        ORDER BY
+        sk_num DESC
+        LIMIT 6
+    </select>
+
+    <select id="getWgBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS wg_num,
+            a.be_uv AS building_id,
+            a.create_date,
+            d.building_name
+        FROM
+            ta_uv a
+        LEFT JOIN ta_building d ON a.be_uv = d.building_id
+        LEFT JOIN ta_person p ON a.person_id = p.person_id
+        WHERE
+            a.tagert_type = 'project'
+            and p.org_id = #{orgId}
+            and a.be_uv != "undefined"
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND a.be_uv in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            <if test="startDate != null">
+                and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
+        GROUP BY
+            a.be_uv
+        ORDER BY
+            wg_num DESC
+        LIMIT 6
+    </select>
+
+    <select id="getFwBarData" resultType="java.util.Map">
+        SELECT
+            t.pv_num,
+            t.building_id,
+            t.building_name
+        FROM
+            ta_building t
+        WHERE
+            t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND a.be_uv in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        ORDER BY
+        pv_num DESC
+        LIMIT 6
+    </select>
+
+    <select id="getStatsTableList" resultType="com.huiju.estateagents.excel.StatsBuilding">
+        SELECT
+            t.building_id,
+            t.building_name,
+            IFNULL( t.pv_num, 0 ) AS pv_num,
+            IFNULL( uu.uv_num, 0 ) AS uv_num,
+            IFNULL( aa.sk_num, 0 ) AS sk_num,
+            IFNULL( bbb.gk_num, 0 ) AS gk_num,
+            IFNULL( aa.sk_num, 0 ) + IFNULL( bbb.gk_num, 0 ) AS kh_num
+        FROM
+            ta_building t
+        LEFT JOIN (
+            SELECT
+                count( * ) AS sk_num,
+                a.building_id
+            FROM
+                ta_recommend_customer a
+            WHERE
+                a.STATUS > 0
+                AND a.verify_status = 1
+                AND a.realty_consultant IS NOT NULL
+                AND a.realty_consultant != ''
+                AND a.org_id = #{orgId}
+                <if test="startDate != null">
+                    and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                a.building_id
+        ) aa ON aa.building_id = t.building_id
+        LEFT JOIN (
+            SELECT
+                count( * ) AS gk_num,
+                bb.building_id
+            FROM
+            (
+                SELECT
+                    b.*
+                FROM
+                    ta_person b
+                WHERE
+                    b.STATUS > 0
+                    AND b.org_id = #{orgId}
+                    AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                    AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+                    <if test="startDate != null">
+                        and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                    </if>
+                    <if test="endDate != null">
+                        and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                    </if>
+                GROUP BY
+                    b.person_id
+            ) bb
+            GROUP BY
+                bb.building_id
+        ) bbb ON bbb.building_id = t.building_id
+        LEFT JOIN (
+            SELECT
+                count( * ) AS uv_num,
+                u.be_uv AS building_id
+            FROM
+                ta_uv u
+            WHERE
+                u.tagert_type = 'project'
+            <if test="startDate != null">
+                and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+            </if>
+            <if test="endDate != null">
+                and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+            </if>
+            GROUP BY
+                u.be_uv
+        ) uu ON uu.building_id = t.building_id
+        WHERE
+        t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != '' ">
+            AND t.building_id = #{buildingId}
+        </if>
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
+    </select>
+    <select id="getExportTableList" resultType="com.huiju.estateagents.excel.StatsBuilding">
+        SELECT
+        t.building_id,
+        t.building_name,
+        IFNULL( t.pv_num, 0 ) AS pv_num,
+        IFNULL( uu.uv_num, 0 ) AS uv_num,
+        IFNULL( aa.sk_num, 0 ) AS sk_num,
+        IFNULL( bbb.gk_num, 0 ) AS gk_num,
+        IFNULL( aa.sk_num, 0 ) + IFNULL( bbb.gk_num, 0 ) AS kh_num
+        FROM
+        ta_building t
+        LEFT JOIN (
+        SELECT
+        count( * ) AS sk_num,
+        a.building_id
+        FROM
+        ta_recommend_customer a
+        WHERE
+        a.STATUS > 0
+        AND a.verify_status = 1
+        AND a.realty_consultant IS NOT NULL
+        AND a.realty_consultant != ''
+        AND a.org_id = #{orgId}
+        <if test="startDate != null">
+            and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        a.building_id
+        ) aa ON aa.building_id = t.building_id
+        LEFT JOIN (
+        SELECT
+        count( * ) AS gk_num,
+        bb.building_id
+        FROM
+        (
+        SELECT
+        b.*
+        FROM
+        ta_person b
+        WHERE
+        b.STATUS > 0
+        AND b.org_id = #{orgId}
+        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+        <if test="startDate != null">
+            and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        b.person_id
+        ) bb
+        GROUP BY
+        bb.building_id
+        ) bbb ON bbb.building_id = t.building_id
+        LEFT JOIN (
+        SELECT
+        count( * ) AS uv_num,
+        u.be_uv AS building_id
+        FROM
+        ta_uv u
+        WHERE
+        u.tagert_type = 'project'
+        <if test="startDate != null">
+            and  TO_DAYS(u.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(u.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        u.be_uv
+        ) uu ON uu.building_id = t.building_id
+        WHERE
+        t.org_id = #{orgId}
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
+        <if test="buildingId != null and buildingId != '' ">
+            AND t.building_id = #{buildingId}
+        </if>
+    </select>
+    <select id="getStatsTimeBarList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
+        SELECT
+            t.date as create_date,
+            IFNULL( s.sk_num, 0 ) AS sk_num,
+            IFNULL( g.gk_num, 0 ) AS gk_num,
+            IFNULL( u.uv_num, 0 ) AS uv_num,
+            IFNULL( s.sk_num, 0 ) + IFNULL( g.gk_num, 0 ) AS kh_num
+        FROM
+        (
+            SELECT
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            FROM
+            sequence a
+            WHERE
+            a.rownum &lt;= datediff( #{endDate}, #{startDate} )
+        ) t
+        LEFT JOIN (
+            SELECT
+                count( * ) AS sk_num,
+                a.building_id,
+                DATE_FORMAT( a.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_recommend_customer a
+            WHERE
+                a.STATUS > 0
+                AND a.verify_status = 1
+                AND a.realty_consultant IS NOT NULL
+                AND a.realty_consultant != ''
+                AND a.org_id = #{orgId}
+                AND a.building_id = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                DATE_FORMAT( a.create_date, '%Y-%m-%d' )
+        ) s ON t.date = s.create_date
+        LEFT JOIN (
+            SELECT
+                count( * ) AS gk_num,
+                b.building_id,
+                DATE_FORMAT( b.create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_person b
+            WHERE
+                b.STATUS > 0
+                AND b.org_id = #{orgId}
+                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+                AND b.building_id = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                b.person_id,
+                DATE_FORMAT( b.create_date, '%Y-%m-%d' )
+        ) g ON t.date = g.create_date
+        LEFT JOIN (
+            SELECT
+                count( * ) AS uv_num,
+                be_uv AS building_id,
+                DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+            FROM
+                ta_uv
+            WHERE
+                tagert_type = 'project'
+                AND be_uv = #{buildingId}
+                <if test="startDate != null">
+                    and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+            GROUP BY
+                DATE_FORMAT( create_date, '%Y-%m-%d' )
+        ) u ON t.date = u.create_date
+    </select>
+    <select id="getStatsTimeTableList" resultType="com.huiju.estateagents.excel.StatsTimeBuilding">
+        SELECT
+        t.date as create_date,
+        IFNULL( s.sk_num, 0 ) AS sk_num,
+        IFNULL( g.gk_num, 0 ) AS gk_num,
+        IFNULL( u.uv_num, 0 ) AS uv_num,
+        IFNULL( s.sk_num, 0 ) + IFNULL( g.gk_num, 0 ) AS kh_num
+        FROM
+        (
+        SELECT
+        DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+        FROM
+        sequence a
+        WHERE
+        a.rownum &lt;= datediff( #{endDate}, #{startDate} )
+        ) t
+        LEFT JOIN (
+        SELECT
+        count( * ) AS sk_num,
+        a.building_id,
+        DATE_FORMAT( a.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_recommend_customer a
+        WHERE
+        a.STATUS > 0
+        AND a.verify_status = 1
+        AND a.realty_consultant IS NOT NULL
+        AND a.realty_consultant != ''
+        AND a.org_id = #{orgId}
+        AND a.building_id = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(a.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        DATE_FORMAT( a.create_date, '%Y-%m-%d' )
+        ) s ON t.date = s.create_date
+        LEFT JOIN (
+        SELECT
+        count( * ) AS gk_num,
+        b.building_id,
+        DATE_FORMAT( b.create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_person b
+        WHERE
+        b.STATUS > 0
+        AND b.org_id = #{orgId}
+        AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+        AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = 84 AND person_id IS NOT NULL AND person_id != '' )
+        AND b.building_id = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        b.person_id,
+        DATE_FORMAT( b.create_date, '%Y-%m-%d' )
+        ) g ON t.date = g.create_date
+        LEFT JOIN (
+        SELECT
+        count( * ) AS uv_num,
+        be_uv AS building_id,
+        DATE_FORMAT( create_date, '%Y-%m-%d' ) AS create_date
+        FROM
+        ta_uv
+        WHERE
+        tagert_type = 'project'
+        AND be_uv = #{buildingId}
+        <if test="startDate != null">
+            and  TO_DAYS(create_date) >= TO_DAYS(#{startDate})
+        </if>
+        <if test="endDate != null">
+            and  TO_DAYS(create_date) &lt;= TO_DAYS(#{endDate})
+        </if>
+        GROUP BY
+        DATE_FORMAT( create_date, '%Y-%m-%d' )
+        ) u ON t.date = u.create_date
+        <if test="sortField != null and sortField != ''">
+            ORDER BY ${sortField} ${orderType}
+        </if>
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -42,4 +42,32 @@
             tpir.person_id, tpir.building_id
         ORDER BY SUM(tpir.intention) DESC
     </select>
+    <select id="selectExportIntentionUser" resultType="com.huiju.estateagents.excel.IntentionUser">
+        SELECT
+        tpir.person_name as  person_name,
+        tp.phone as phone,
+        tpir.building_name as building_name,
+        SUM(tpir.intention) as intention
+        FROM
+        ta_person_intention_record tpir
+        LEFT JOIN ta_person tp on tpir.person_id = tp.person_id
+        <trim prefix="where" prefixOverrides="and | or">
+            <if test="buildingId != null and buildingId != ''">
+                tpir.building_id = #{buildingId}
+            </if>
+            <if test="orgId != null">
+                AND tpir.org_id = #{orgId}
+                AND tp.org_id = #{orgId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND tpir.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+        </trim>
+        GROUP BY
+        tpir.person_id, tpir.building_id
+        ORDER BY SUM(tpir.intention) DESC
+    </select>
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -605,6 +605,15 @@ FROM
             </if>
                 GROUP BY t.person_id) d
     </select>
+    <select id="selectTodayRecentlyCount" resultType="java.lang.Integer">
+        SELECT
+            COUNT(1) as activity_count
+        FROM
+        ta_person tp
+        where tp.org_id = #{orgId} AND
+        tp.person_type IN ('customer','drift','estate agent')
+        AND DATE_FORMAT(tp.create_date,'%Y-%m-%d') = DATE_FORMAT(#{nowDate},'%Y-%m-%d')
+    </select>
 
     <insert id="savePersonPosition" parameterType="com.huiju.estateagents.entity.TaPersonPositon">
         insert into ta_person_position

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

@@ -66,4 +66,27 @@
         DATE_FORMAT( tp.create_date, '%Y-%m-%d' ),
         tp.scene_type
     </select>
+    <select id="selectNewLinePersonFromGroupByData"
+            resultType="com.huiju.estateagents.statistic.entity.TsPersonFromStatistic">
+        SELECT
+        sum( tp.from_num ) AS from_num,
+        sum( tp.registered_num ) AS registered_num,
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) AS create_time,
+        tp.scene_type
+        FROM
+        ts_person_from_statistic tp
+        WHERE
+        tp.org_id = #{orgId}
+        and tp.scene_type != ''
+        and tp.scene_type is not null
+        <if test="startDate != null or endDate != null">
+            AND  DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN #{startDate} and #{endDate}
+        </if>
+        <if test="startDate == null or endDate == null">
+            AND DATE_FORMAT( tp.create_date, '%Y-%m-%d' ) BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+        </if>
+        GROUP BY
+        DATE_FORMAT( tp.create_date, '%Y-%m-%d' )
+        ORDER BY tp.create_date
+    </select>
 </mapper>