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

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

 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.service.IStatisticalService;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Date;
 
 /**
  * 数据统计
         return iStatisticalService.indexStatistical();
     }
 
+    /**
+     * 活跃用户数
+     * @return
+     */
+    @GetMapping(value = "/selectActiveUserCount")
+    public ResponseBean selectActiveUserCount(@RequestParam String dateType) {
+        return iStatisticalService.selectActiveUserCount(dateType);
+    }
+
+    /**
+     * 活跃用户数
+     * @return
+     */
+    @GetMapping(value = "/selectNewsUserCount")
+    public ResponseBean selectNewsUserCount(@RequestParam(required = false) Date startDate,
+                                            @RequestParam(required = false) Date endDate) {
+        return iStatisticalService.selectNewsUserCount(startDate, endDate);
+    }
+
+    /**
+     * 用户行为
+     * @return
+     */
+    @GetMapping(value = "/selectUserBehavior")
+    public ResponseBean selectUserBehavior(@RequestParam(required = false) Date startDate,
+                                            @RequestParam(required = false) Date endDate) {
+        return iStatisticalService.selectUserBehavior(startDate, endDate);
+    }
+
+
+    /**
+     * 行为分析的 列表
+     * @return
+     */
+    @GetMapping(value = "/selectUserBehaviorAll")
+    public ResponseBean selectUserBehaviorAll(@RequestParam(required = false) Integer pageNum,
+                                           @RequestParam(required = false) Integer pageCode) {
+        return iStatisticalService.selectUserBehaviorAll(pageNum, pageCode);
+    }
+
+    /**
+     * 行为分析的 具体数据列表
+     * @return
+     */
+    @GetMapping(value = "/selectEventAll")
+    public ResponseBean selectEventAll(@RequestParam(required = false) String event,
+                                              @RequestParam(required = false) Integer personId) {
+        return iStatisticalService.selectEventAll(event, personId);
+    }
 
 }

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

             targets = iTaSaveService.getTargesOfPerson(persons.get(0).getPersonId(), CommConstant.FAVOR_PROJECT);
         }
 
-        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets,cityId);
+        return taBuildingService.getWxBuildingList(pageNum, pageSize, name, targets, cityId);
     }
 
     /**

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

         try {
             //使用分页插件
 		    IPage<TaPersonIntentionRecord> pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaPersonIntentionRecord> queryWrapper = new QueryWrapper<>();
-            queryWrapper.orderByDesc("create_date");
 
-            IPage<TaPersonIntentionRecord> result = iTaPersonIntentionRecordService.page(pg, queryWrapper);
-            responseBean.addSuccess(result);
+            responseBean = iTaPersonIntentionRecordService.selectAll(pg);
         }catch (Exception e){
             logger.error("taPersonIntentionRecordList -=- {}",e.toString());
             responseBean.addError(e.getMessage());

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

     private ITaSaveService iTaSaveService;
 
     /**
-     * 点赞
+     * 收藏
      * @param typeOf
      * @param id
      * @param request
     }
 
     /**
-     * 取消赞
+     * 取消收藏
      * @param typeOf
      * @param id
      * @param request

src/main/java/com/huiju/estateagents/entity/TaPersonIntentionRecord.java

 package com.huiju.estateagents.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
      */
     private Integer orgId;
 
+    /**
+     * 手机号
+     */
+    @TableField(exist = false)
+    private String phone;
+
+    /**
+     * 意向值总和
+     */
+    @TableField(exist = false)
+    private Integer intentionCount;
 
 }

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

 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.Map;
+
 /**
  * <p>
  * 项目动态表 Mapper 接口
      * @param page
      * @return
      */
-    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") int cityId);
+    IPage<TaBuildingDynamic> buildingDynamicList(Page page, @Param("name") String name, @Param("buildingId") String buildingId,@Param("cityId") Integer cityId);
 
     /**
      * 详情
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") int increment);
 
     void updateTaBuildingDynamic(@Param("dynamicId") String dynamicId, @Param("sum") String sum);
+
+    /**
+     * 转化率 活动收藏 / 活动分享
+     * @return
+     */
+    Map<String, Object> selectBuildingDynamicStatistical(String saveOrShare);
 }

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

 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
      * @return
      */
     TaBuilding selectBuilding(@Param("buildingId") String buildingId);
+
+    /**
+     * 转化率 项目收藏 / 项目分享
+     * @return
+     */
+    Map<String, Object> selectBuildingStatistical(String saveOrShare);
 }

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

 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.Map;
+
 /**
  * <p>
  * 资讯表  Mapper 接口
     @Update("UPDATE ta_news  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE news_id = #{newsId}")
     void setFieldNum(@Param("newsId") String newsId, @Param("field") String field, @Param("increment") Integer increment);
 
+
+    /**
+     * 转化率 咨迅收藏 / 咨迅分享
+     * @return
+     */
+    Map<String, Object> selectNewsStatistical(String saveOrShare);
+
 }

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

 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 import org.apache.ibatis.annotations.Mapper;
 
 @Mapper
 public interface TaPersonIntentionRecordMapper extends BaseMapper<TaPersonIntentionRecord> {
 
+
+    IPage<TaPersonIntentionRecord> selectAll(IPage<TaPersonIntentionRecord> page);
+
 }

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

      */
     List<Map<String, Object>> selectActiveUserCount(@Param("personType") String personType, @Param("dateType") String dateType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
 
+    /**
+     * 新增用户数
+     * @param personType
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    List<Map<String, Object>> selectNewsUserCount(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
 
     /**
      * 性别比例
     List<Map<String, Object>> selectSexUser(@Param("personType") String personType);
 
 
-
-
-
-
+    /**
+     * 城市比例
+     * @param personType
+     * @return
+     */
+    @Select("select city, count(1) from ta_person where person_type = #{personType} GROUP BY city")
+    List<Map<String, Object>> selectCityUser(@Param("personType") String personType);
 
 
 }

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

 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
 
  */
 @Mapper
 public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecord> {
-    List<TaPersonVisitRecord>visitRecordByPersonId(@Param("personId") String personId);
 
+    List<TaPersonVisitRecord> visitRecordByPersonId(@Param("personId") String personId);
+
+    /**
+     * 行为分析的 列表
+     * @param page
+     * @return
+     */
+    IPage<TaPersonVisitRecord> selectAll(IPage<TaPersonVisitRecord> page);
+
+
+    /**
+     * 行为分析的 具体数据
+     *
+     * @return
+     */
+    @Select("select * from ta_person_visit_record where event = #{event} and person_id = #{personId}")
+    List<TaPersonVisitRecord> selectEventAll(@Param("event") String event, @Param("personId") Integer personId);
 
 }

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

 
 import com.huiju.estateagents.base.ResponseBean;
 
+import java.util.Date;
+
 /**
  * 数据统计 接口
  */
      */
     ResponseBean selectActiveUserCount(String dateType);
 
+    /**
+     * 新增用户数
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean selectNewsUserCount(Date startDate,Date endDate);
+
+    /**
+     * 用户行为
+     * @param startDate
+     * @param endDate
+     * @return
+     */
+    ResponseBean selectUserBehavior(Date startDate,Date endDate);
+
+    /**
+     * 行为分析的 列表
+     * @param pageNum
+     * @param pageCode
+     * @return
+     */
+    ResponseBean selectUserBehaviorAll(Integer pageNum, Integer pageCode);
+
+    /**
+     * 行为分析的 具体数据列表
+     * @param event
+     * @param personId
+     * @return
+     */
+    ResponseBean selectEventAll(String event, Integer personId);
 }

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

      * 项目动态管理列表
      * @return
      */
-    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,int cityId);
+    ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId);
 
     /**
      * 项目详情

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

      * @param pageSize
      * @param name
      */
-    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId);
+    ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId);
 
     /**
      * 微信小程序 楼盘列表

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

      */
     ResponseBean wxTaPvNum(Integer id);
 
-    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId);
+    IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId);
 }

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

 package com.huiju.estateagents.service;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 
 /**
  */
 public interface ITaPersonIntentionRecordService extends IService<TaPersonIntentionRecord> {
 
+
+    ResponseBean selectAll(IPage<TaPersonIntentionRecord> pg);
 }

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

 package com.huiju.estateagents.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.CommConstant;
+import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.exception.EstaException;
+import com.huiju.estateagents.mapper.TaBuildingMapper;
 import com.huiju.estateagents.mapper.TaPersonMapper;
+import com.huiju.estateagents.mapper.TaPersonVisitRecordMapper;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
     @Autowired
     private TaPersonMapper taPersonMapper;
 
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+
+    @Autowired
+    private TaPersonVisitRecordMapper taPersonVisitRecordMapper;
 
     @Override
     public ResponseBean indexStatistical() {
         // 用户行为
         List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
 
-        // 用户活跃数 / 新增用户数
+        // 用户活跃数
         List<Map<String, Object>> selectActiveUserCount = taPersonMapper.selectActiveUserCount(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.DAY, null, null);
 
+        // 新增用户数
+        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+
         // 性别比例
         List<Map<String, Object>> selectSexUser = taPersonMapper.selectSexUser(CommConstant.PERSON_REALTY_CONSULTANT);
 
+        // 城市比例
+        List<Map<String, Object>> selectCityUser = taPersonMapper.selectCityUser(CommConstant.PERSON_REALTY_CONSULTANT);
+
+        // 转化率, 当前 默认项目收藏
+        Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical("save");
+
         map.put("selectUserCount", selectUserCount);
         map.put("selectRegisteredCount", selectRegisteredCount);
         map.put("selectRecentlyCount", selectRecentlyCount);
         map.put("selectUserBehavior", selectUserBehavior);
         map.put("selectActiveUserCount", selectActiveUserCount);
+        map.put("selectNewsUserCount", selectNewsUserCount);
         map.put("selectSexUser", selectSexUser);
+        map.put("selectCityUser", selectCityUser);
+        map.put("selectBuildingStatistical", selectBuildingStatistical);
 
         responseBean.addSuccess(map);
 
         responseBean.addSuccess(map);
         return responseBean;
     }
+
+    @Override
+    public ResponseBean selectNewsUserCount(Date startDate, Date endDate) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 新增用户数
+        List<Map<String, Object>> selectNewsUserCount = taPersonMapper.selectNewsUserCount(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectNewsUserCount", selectNewsUserCount);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectUserBehavior(Date startDate, Date endDate) {
+        ResponseBean responseBean = new ResponseBean();
+
+        // 用户行为
+        List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
+
+        Map<String, Object> map = new HashMap<>();
+        map.put("selectUserBehavior", selectUserBehavior);
+        responseBean.addSuccess(map);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectUserBehaviorAll(Integer pageNum, Integer pageSize) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page);
+        responseBean.addSuccess(visitRecordIPage);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean selectEventAll(String event, Integer personId) {
+        ResponseBean responseBean = new ResponseBean();
+
+        List<TaPersonVisitRecord> taPersonVisitRecords = taPersonVisitRecordMapper.selectEventAll(event, personId);
+        responseBean.addSuccess(taPersonVisitRecords);
+        return responseBean;
+    }
 }

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

         binder.registerCustomEditor(Date.class, editor);
     }
     @Override
-    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,int cityId) {
+    public ResponseBean iBuildingDynamicList(Integer pageNum, Integer pageSize, String name, String buildingId,Integer cityId) {
         Page<TaBuildingDynamic> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);

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

     }
 
     @Override
-    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,int cityId) {
+    public ResponseBean getWxBuildingList(Integer pageNum, Integer pageSize, String name, List<String> targets,Integer cityId) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaBuilding> buildingQueryWrapper = new QueryWrapper<>();
         buildingQueryWrapper.nested(null != name && !"".equals(name.trim()), i -> i.like("name", name).or().like("building_name", name));
         buildingQueryWrapper.eq("status", 1);
-        buildingQueryWrapper.eq(cityId != 0,"city_id",cityId);
+        buildingQueryWrapper.eq(null != cityId && cityId != 0,"city_id", cityId);
         buildingQueryWrapper.in(null != targets && targets.size() > 0, "building_id", targets);
 //        buildingQueryWrapper.like(null != name && !"".equals(name.trim()), "name", name);
         buildingQueryWrapper.orderByAsc("order_no");

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

     }
 
     @Override
-    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,int cityId) {
+    public IPage<TaNews> getWxList(Integer pageNum, Integer pageSize, String buildingId, List<String> targets,Integer cityId) {
         IPage<TaNews> page = new Page<>(pageNum, pageSize);
 
         QueryWrapper<TaNews> taNewsQueryWrapper = new QueryWrapper<>();
         taNewsQueryWrapper.eq(!StringUtils.isEmpty(buildingId), "building_id", buildingId);
         taNewsQueryWrapper.in(null != targets && targets.size() > 0, "news_id", targets);
-        taNewsQueryWrapper.eq(cityId != 0,"city_id",cityId);
+        taNewsQueryWrapper.eq(null != cityId && cityId != 0,"city_id",cityId);
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNews> taNewsIPage = this.page(page, taNewsQueryWrapper);

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

 package com.huiju.estateagents.service.impl;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonIntentionRecord;
 import com.huiju.estateagents.mapper.TaPersonIntentionRecordMapper;
 import com.huiju.estateagents.service.ITaPersonIntentionRecordService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 /**
 @Service
 public class TaPersonIntentionRecordServiceImpl extends ServiceImpl<TaPersonIntentionRecordMapper, TaPersonIntentionRecord> implements ITaPersonIntentionRecordService {
 
+    @Autowired
+    private TaPersonIntentionRecordMapper taPersonIntentionRecordMapper;
+
+    @Override
+    public ResponseBean selectAll(IPage<TaPersonIntentionRecord> pg) {
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaPersonIntentionRecord> taPersonIntentionRecordIPage = taPersonIntentionRecordMapper.selectAll(pg);
+        responseBean.addSuccess(taPersonIntentionRecordIPage);
+        return responseBean;
+    }
 }

src/main/resources/mapper/TaBuildingDynamicMapper.xml

 	      dynamic_id = #{dynamicId}
     </select>
 
+    <select id="selectBuildingDynamicStatistical" resultType="map">
+            select
+            sum(pv_num) as pvNum,
+            <if test="saveOrShare === 'save'">
+                sum(save_num) as saveNum
+            </if>
+            <if test="saveOrShare === 'share'">
+                sum(share_num) as shareNum
+            </if>
+            from ta_building_dynamic
+    </select>
+
 </mapper>

src/main/resources/mapper/TaBuildingMapper.xml

          where building_id = #{buildingId}
     </select>
 
+    <select id="selectBuildingStatistical" resultType="map">
+        select
+          sum(pv_num) as pvNum,
+          <if test="saveOrShare === 'save'">
+              sum(save_num) as saveNum
+          </if>
+          <if test="saveOrShare === 'share'">
+              sum(share_num) as shareNum
+          </if>
+        from ta_building
+    </select>
+
 </mapper>

src/main/resources/mapper/TaNewsMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaNewsMapper">
 
+
+    <select id="selectNewsStatistical" resultType="map" >
+        select
+        sum(pv_num) as pvNum,
+        <if test="saveOrShare === 'save'">
+            sum(save_num) as saveNum
+        </if>
+        <if test="saveOrShare === 'share'">
+            sum(share_num) as shareNum
+        </if>
+        from ta_news
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaPersonIntentionRecordMapper">
 
+    <select id="selectAll" resultType="com.huiju.estateagents.entity.TaPersonIntentionRecord">
+        SELECT
+            *,
+            tp.phone as phone,
+            SUM(tpir.intention) as intentionCount
+        FROM
+            ta_person_intention_record tpir
+            LEFT JOIN ta_person tp ON tpir.person_id = tp.person_id
+            GROUP BY tpir.person_id
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
             where tp.person_type = #{personType}
             GROUP BY tpvr.activity
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visitTime , '%Y-%m-%d' )
     </select>
 
     <select id="selectActiveUserCount" resultType="map">
                 tpvr.visit_time AS visit_time
             FROM
                ta_person tp
-            where tp.person_type = #{personType}
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+             where tp.person_type = #{personType}
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
     </select>
 
+    <select id="selectNewsUserCount" >
+        SELECT
+        consultant_count_table.date as date,
+        consultant_count_table.consultant_count as consultant_count,
+        user_count_table.user_count as user_count
+        FROM
+        (
+            SELECT
+              *
+            FROM
+            (
+                SELECT
+                DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+                FROM
+                sequence a
+                WHERE
+                <if test="startDate == null or endDate == null">
+                    a.rownum <![CDATA[ <= ]]> 7
+                </if>
+                <if test="startDate != null or endDate != null">
+                    a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+                </if>
+            ) AS temp_date
+            LEFT JOIN (
+                SELECT
+                COUNT(1) as consultant_count,
+                tpvr.visit_time AS visit_time
+                FROM
+                ta_person tp
+                INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+                where tp.person_type = 'Realty Consultant'
+            ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+        ) as consultant_count_table
+        ,
+        (SELECT
+        *
+        FROM
+        (
+            SELECT
+            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+            FROM
+            sequence a
+            WHERE
+            <if test="startDate == null or endDate == null">
+                a.rownum <![CDATA[ <= ]]> 7
+            </if>
+            <if test="startDate != null or endDate != null">
+                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
+            </if>
+        ) AS temp_date
+        LEFT JOIN (
+            SELECT
+            COUNT(1) as user_count,
+            tpvr.visit_time AS visit_time
+            FROM
+            ta_person tp
+            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
+
+        ) as user_count_table
+        GROUP BY date
+    </select>
+
 </mapper>

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

         where person_id = #{personId}
     </select>
 
+    <select id="selectAll">
+        SELECT
+            tpvr.*,
+            tp.name,
+            COUNT(1) as accessCount
+        FROM
+            ta_person_visit_record tpvr
+            LEFT JOIN ta_person tp ON tpvr.person_id = tp.person_id
+        GROUP BY tpvr.person_id, tpvr.event
+    </select>
+
 </mapper>