统计修改

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -295,4 +295,11 @@ public class CommConstant {
 
 
     // ------   转化率 end ---------
+
+
+    // ------- 用户来源 查询条件 start ----------
+
+    public static final String REGISTERED_TYPE = "registered";
+
+    // ------- 用户来源 查询条件 end ----------
 }

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

@@ -3,8 +3,10 @@ package com.huiju.estateagents.controller;
 import com.huiju.estateagents.base.ResponseBean;
 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 java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -59,24 +61,15 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectUserBehavior")
-    public ResponseBean selectUserBehavior(@RequestParam(required = false) Date startDate,
-                                            @RequestParam(required = false) Date endDate) {
-        return iStatisticalService.selectUserBehavior(startDate, endDate);
-    }
-
-
-    /**
-     * 行为分析的 列表
-     * @return
-     */
-    @GetMapping(value = "/admin/selectUserBehaviorAll")
-    public ResponseBean selectUserBehaviorAll(@RequestParam(required = false) Integer pageNum,
-                                           @RequestParam(required = false) Integer pageCode) {
-        return iStatisticalService.selectUserBehaviorAll(pageNum, pageCode);
+    public ResponseBean selectUserBehavior(@RequestParam(required = false) Integer pageNum,
+                                           @RequestParam(required = false) Integer pageCode,
+                                           @RequestParam(required = false) Date startDate,
+                                           @RequestParam(required = false) Date endDate) {
+        return iStatisticalService.selectUserBehavior(pageNum, pageCode, startDate, endDate);
     }
 
     /**
-     * 行为分析的 具体数据列表
+     * 行为分析的 具体事件数据列表
      * @return
      */
     @GetMapping(value = "/admin/selectEventAll")
@@ -85,24 +78,16 @@ public class StatisticalController {
         return iStatisticalService.selectEventAll(event, personId);
     }
 
-    /**
-     * 行为分析的 具体数据列表
-     * @return
-     */
-    @GetMapping(value = "/admin/selectConversion/activity")
-    public ResponseBean selectConversionAll(@RequestParam(value = "conversion") String conversion) {
-        return iStatisticalService.selectConversion(conversion);
-    }
-
 
     /**
      * 用户来源 统计首页
      * @return
      */
     @GetMapping(value = "/admin/selectUserResource")
-    public ResponseBean selectUserResource(@RequestParam(value = "startDate", required = false) Date startDate,
-                                           @RequestParam(value = "endDate", required = false) Date endDate) {
-        return iStatisticalService.selectUserResource(startDate, endDate);
+    public ResponseBean selectUserResource(@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 = "registeredType", required = false) String registeredType) {
+        return iStatisticalService.selectUserResource(startDate, endDate, registeredType);
     }
 
 

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

@@ -10,6 +10,7 @@ import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.io.Serializable;
+import java.time.LocalDate;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
@@ -136,12 +137,12 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * 用户来源 柱状
      * @return
      */
-    List<Map<String, Object>> selectUserSourceColumnar(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    List<Map<String, Object>> selectUserSourceColumnar(@Param("personType") String personType, @Param("startDate") LocalDate startDate, @Param("endDate")LocalDate endDate);
 
     /**
      * 用户来源 数据列表
      */
-    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
+    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")LocalDate startDate, @Param("endDate")LocalDate endDate, @Param("registeredType") String registeredType);
 
     // ------------- 用户来源 end ------------
 

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.service;
 
 import com.huiju.estateagents.base.ResponseBean;
 
+import java.time.LocalDate;
 import java.util.Date;
 
 /**
@@ -35,15 +36,7 @@ public interface IStatisticalService {
      * @param endDate
      * @return
      */
-    ResponseBean selectUserBehavior(Date startDate,Date endDate);
-
-    /**
-     * 行为分析的 列表
-     * @param pageNum
-     * @param pageCode
-     * @return
-     */
-    ResponseBean selectUserBehaviorAll(Integer pageNum, Integer pageCode);
+    ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, Date startDate,Date endDate);
 
     /**
      * 行为分析的 具体数据列表
@@ -64,6 +57,6 @@ public interface IStatisticalService {
      * 用户来源 首页
      * @return
      */
-    ResponseBean selectUserResource(Date startDate, Date endDate);
+    ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType);
 
 }

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

@@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.HashMap;
@@ -77,6 +78,27 @@ public class StatisticalServiceImpl implements IStatisticalService {
         // 转化率, 当前 默认项目收藏
         Map<String, Object> selectBuildingStatistical = taBuildingMapper.selectBuildingStatistical("save");
 
+        // -------  用户来源 start ------------
+
+        // 用户来源 柱状
+        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, null, null);
+
+        // 用户来源 饼状
+        // 来源置业顾问, 来源全民经纪人，自由进入
+        Integer person_realty_consultant = taPersonMapper.selectUserSourcePie(CommConstant.PERSON_REALTY_CONSULTANT, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_estate_agent = taPersonMapper.selectUserSourcePie(CommConstant.PERSON_ESTATE_AGENT, CommConstant.PERSON_REALTY_CONSULTANT);
+        Integer person_null = taPersonMapper.selectUserSourcePie(null, CommConstant.PERSON_REALTY_CONSULTANT);
+        Map<String, Object> pieMap = new HashMap<>();
+        pieMap.put("person_realty_consultant", person_realty_consultant);
+        pieMap.put("person_estate_agent", person_estate_agent);
+        pieMap.put("person_null", person_null);
+
+        Map<String, Object> result = new HashMap<>();
+        result.put("columnar", mapList);
+        result.put("pie", pieMap);
+
+        // -------  用户来源 end ------------
+
         map.put("selectUserCount", selectUserCount);
         map.put("selectRegisteredCount", selectRegisteredCount);
         map.put("selectRecentlyCount", selectRecentlyCount);
@@ -86,6 +108,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         map.put("selectSexUser", selectSexUser);
         map.put("selectCityUser", selectCityUser);
         map.put("selectBuildingStatistical", selectBuildingStatistical);
+        map.put("selectUserSource", result);
 
         responseBean.addSuccess(map);
 
@@ -129,27 +152,22 @@ public class StatisticalServiceImpl implements IStatisticalService {
     }
 
     @Override
-    public ResponseBean selectUserBehavior(Date startDate, Date endDate) {
+    public ResponseBean selectUserBehavior(Integer pageNum, Integer pageSize, Date startDate, Date endDate) {
         ResponseBean responseBean = new ResponseBean();
 
         // 用户行为
         List<PersonPO> selectUserBehavior = taPersonMapper.selectUserBehavior(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
 
+        IPage<TaPersonVisitRecord> page = new Page<>(pageNum, pageSize);
+        IPage<TaPersonVisitRecord> visitRecordIPage = taPersonVisitRecordMapper.selectAll(page);
+
         Map<String, Object> map = new HashMap<>();
         map.put("selectUserBehavior", selectUserBehavior);
+        map.put("data", visitRecordIPage);
         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();
@@ -215,7 +233,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean selectUserResource(Date startDate, Date endDate) {
+    public ResponseBean selectUserResource(LocalDate startDate, LocalDate endDate, String registeredType) {
         ResponseBean responseBean = new ResponseBean();
         // 用户来源 柱状
         List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
@@ -231,7 +249,7 @@ public class StatisticalServiceImpl implements IStatisticalService {
         map.put("person_null", person_null);
 
         // 用户来源 数据列表
-        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
+        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate, registeredType);
 
         Map<String, Object> result = new HashMap<>();
         result.put("columnar", mapList);

src/main/resources/mapper/TaPersonMapper.xml

@@ -170,34 +170,37 @@ FROM
 
 
     <select id="selectUserBehavior" resultType="com.huiju.estateagents.po.PersonPO">
+
         SELECT
-        *
+            temp_date.date as date,
+            temp_date.type_name as activity,
+            temp.activityCount as activityCount
         FROM
         (
-            SELECT
-            DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
-            FROM
-            sequence a
-            WHERE
+        SELECT
+          DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date, b.type_id, b.type_name
+          from sequence a, td_biz_event_type b
+          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 activityCount,
-            tpvr.visit_time AS visitTime,
-            tbet.type_name as activity
-            FROM
-            ta_person tp
-            INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            INNER JOIN td_biz_event_type tbet ON tpvr.event_type = tbet.type_id
-            where ifnull(tp.person_type, '') != #{personType}
-            GROUP BY tpvr.activity
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.visitTime , '%Y-%m-%d' )
+        SELECT
+        COUNT(1) as activityCount,
+        tpvr.event_type,
+        DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' ) as date
+        FROM
+        ta_person tp
+        INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
+        where ifnull(tp.person_type, '') != #{personType}
+        GROUP BY tpvr.person_id, tpvr.event_type, DATE_FORMAT( tpvr.visit_time , '%Y-%m-%d' )
+        ) AS temp ON temp_date.date = temp.date and temp_date.type_id = temp.event_type
     </select>
 
     <select id="selectActiveUserCount" resultType="map">
@@ -239,7 +242,7 @@ FROM
     <select id="selectNewsUserCount" resultType="map">
         SELECT
         authorization_count_table.date as date,
-        authorization_count_table.authorization_count as authorization_count,
+        ifnull(authorization_count_table.authorization_count, 0) as authorization_count,
         user_count_table.user_count as user_count
         FROM
         (
@@ -353,13 +356,21 @@ FROM
 
     <select id="selectUserSourceData" resultType="map">
         select
-        *
+            temp_date.date AS date,
+            temp_date.from_name as from_name,
+            temp_date.from_code as from_code,
+            IFNULL(user_count.count, 0) as count,
+            user_count.create_date as create_date
         FROM
         (
             SELECT
-              DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
+                DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date,
+                tempf.from_name as from_name,
+                tempf.from_code as from_code
             FROM
-              sequence a
+                sequence a
+                ,
+                td_person_from tempf
             WHERE
             <if test="startDate == null or endDate == null">
                 a.rownum <![CDATA[ <= ]]> 7
@@ -367,22 +378,27 @@ FROM
             <if test="startDate != null or endDate != null">
                 a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
             </if>
+
         ) AS temp_date
+
         LEFT JOIN
         (
             SELECT
-                COUNT(1) as count,
+                ifnull(COUNT(1), 0) as count,
                 tps.create_date as create_date,
                 tpfs.from_code as from_code,
                 tpfs.from_name as from_name
             FROM ta_person tps
             LEFT JOIN td_person_from tpfs
-              ON tps.from_code = tpfs.from_code
+            ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tps.from_code
-              and ifnull(tps.person_type, '') != #{personType}
+            and ifnull(tps.person_type, '') != #{personType}
+            <if test="registeredType == 'registered' and registeredType != ''">
+                and tps.phone is not null
+            </if>
             GROUP BY tpfs.from_code
         ) as user_count
-        ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date
+        ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date and temp_date.from_code = user_count.from_code
     </select>
 
 </mapper>