统计修改

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

@@ -11,7 +11,7 @@ import java.util.Date;
  * 数据统计
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class StatisticalController {
 
     @Autowired
@@ -36,7 +36,7 @@ public class StatisticalController {
     }
 
     /**
-     * 活跃用户数
+     * 新增用户数
      * @return
      */
     @GetMapping(value = "/admin/selectNewsUserCount")
@@ -50,7 +50,7 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectConversion")
-    public ResponseBean selectConversion(String conversion) {
+    public ResponseBean selectConversion(@RequestParam("conversion") String conversion) {
         return iStatisticalService.selectConversion(conversion);
     }
 
@@ -100,9 +100,11 @@ public class StatisticalController {
      * @return
      */
     @GetMapping(value = "/admin/selectUserResource")
-    public ResponseBean selectUserResource() {
-        return iStatisticalService.selectUserResource();
+    public ResponseBean selectUserResource(@RequestParam(value = "startDate", required = false) Date startDate,
+                                           @RequestParam(value = "endDate", required = false) Date endDate) {
+        return iStatisticalService.selectUserResource(startDate, endDate);
     }
 
 
+
 }

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

@@ -62,7 +62,7 @@ public interface TaBuildingDynamicMapper extends BaseMapper<TaBuildingDynamic> {
      * 转化率 活动收藏 / 活动分享
      * @return
      */
-    Map<String, Object> selectBuildingDynamicStatistical(String saveOrShare);
+    Map<String, Object> selectBuildingDynamicStatistical(@Param("saveOrShare") String saveOrShare);
 
     /**
      * 转化率 活动报名

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

@@ -45,5 +45,5 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * 转化率 项目收藏 / 项目分享
      * @return
      */
-    Map<String, Object> selectBuildingStatistical(String saveOrShare);
+    Map<String, Object> selectBuildingStatistical(@Param("saveOrShare") String saveOrShare);
 }

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

@@ -33,6 +33,6 @@ public interface TaNewsMapper extends BaseMapper<TaNews> {
      * 转化率 咨迅收藏 / 咨迅分享
      * @return
      */
-    Map<String, Object> selectNewsStatistical(String saveOrShare);
+    Map<String, Object> selectNewsStatistical(@Param("saveOrShare") String saveOrShare);
 
 }

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

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.po.PersonPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.io.Serializable;
@@ -55,7 +56,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param personType
      * @return
      */
-    @Select("select count(1) from ta_person where person_type != #{personType}")
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where ifnull(person_type, '') != #{personType}")
     Integer selectUserCount(@Param("personType") String personType);
 
     /**
@@ -63,7 +65,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param personType
      * @return
      */
-    @Select("select count(1) from ta_person where person_type != #{personType} and phone is not null")
+    @ResultType(Integer.class)
+    @Select("select count(1) from ta_person where ifnull(person_type, '') != #{personType} and phone is not null")
     Integer selectRegisteredCount(@Param("personType") String personType);
 
     /**
@@ -106,7 +109,7 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param personType
      * @return
      */
-    @Select("select sex, count(1) from ta_person where person_type != #{personType} GROUP BY sex")
+    @Select("select sex, count(1) as sex_count from ta_person where ifnull(person_type, '') != #{personType} GROUP BY sex")
     List<Map<String, Object>> selectSexUser(@Param("personType") String personType);
 
 
@@ -115,7 +118,8 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * @param personType
      * @return
      */
-    @Select("select city, count(1) from ta_person where person_type != #{personType} GROUP BY city")
+    @ResultType(Map.class)
+    @Select("select city, count(1) as city_count  from ta_person where ifnull(person_type, '') != #{personType} GROUP BY city")
     List<Map<String, Object>> selectCityUser(@Param("personType") String personType);
 
 
@@ -132,8 +136,12 @@ public interface TaPersonMapper extends BaseMapper<TaPerson> {
      * 用户来源 柱状
      * @return
      */
-    List<Map<String, Object>> selectUserSourceColumnar(@Param("personType") String personType);
+    List<Map<String, Object>> selectUserSourceColumnar(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
 
+    /**
+     * 用户来源 数据列表
+     */
+    List<Map<String,Object>> selectUserSourceData(@Param("personType") String personType, @Param("startDate")Date startDate, @Param("endDate")Date endDate);
 
     // ------------- 用户来源 end ------------
 

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

@@ -7,6 +7,7 @@ import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.ResultType;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -37,6 +38,7 @@ public interface TaPersonVisitRecordMapper extends BaseMapper<TaPersonVisitRecor
      *
      * @return
      */
+    @ResultType(TaPersonVisitRecord.class)
     @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/mapper/TdPersonFromMapper.java

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TdPersonFrom;
+import org.apache.ibatis.annotations.Mapper;
 
 /**
  * <p>
@@ -12,6 +13,7 @@ import com.huiju.estateagents.entity.TdPersonFrom;
  * @author jobob
  * @since 2019-08-08
  */
+@Mapper
 public interface TdPersonFromMapper extends BaseMapper<TdPersonFrom> {
 
 }

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

@@ -64,6 +64,6 @@ public interface IStatisticalService {
      * 用户来源 首页
      * @return
      */
-    ResponseBean selectUserResource();
+    ResponseBean selectUserResource(Date startDate, Date endDate);
 
 }

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

@@ -215,10 +215,10 @@ public class StatisticalServiceImpl implements IStatisticalService {
 
 
     @Override
-    public ResponseBean selectUserResource() {
+    public ResponseBean selectUserResource(Date startDate, Date endDate) {
         ResponseBean responseBean = new ResponseBean();
         // 用户来源 柱状
-        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT);
+        List<Map<String, Object>> mapList = taPersonMapper.selectUserSourceColumnar(CommConstant.PERSON_REALTY_CONSULTANT, startDate, endDate);
 
         // 用户来源饼状
         // 来源置业顾问, 来源全民经纪人，自由进入
@@ -230,11 +230,15 @@ public class StatisticalServiceImpl implements IStatisticalService {
         map.put("person_estate_agent", person_estate_agent);
         map.put("person_null", person_null);
 
+        // 用户来源 数据列表
+        List<Map<String, Object>> selectUserSourceData = taPersonMapper.selectUserSourceData(CommConstant.PERSON_ESTATE_AGENT, startDate, endDate);
 
         Map<String, Object> result = new HashMap<>();
         result.put("columnar", mapList);
         result.put("pie", map);
+        result.put("data", selectUserSourceData);
 
+        responseBean.addSuccess(result);
         return responseBean;
     }
 }

src/main/resources/mapper/TaBuildingDynamicMapper.xml

@@ -89,10 +89,10 @@
     <select id="selectBuildingDynamicStatistical" resultType="map">
             select
             sum(pv_num) as pvNum,
-            <if test="saveOrShare === 'save'">
+            <if test="saveOrShare == 'save'">
                 sum(save_num) as saveNum
             </if>
-            <if test="saveOrShare === 'share'">
+            <if test="saveOrShare == 'share'">
                 sum(share_num) as shareNum
             </if>
             from ta_building_dynamic
@@ -101,12 +101,7 @@
     <select id="selectBuildingDynamicEnlistStatistical" resultType="map">
         select
         sum(pv_num) as pvNum,
-        <if test="saveOrShare === 'save'">
-            sum(save_num) as saveNum
-        </if>
-        <if test="saveOrShare === 'share'">
-            sum(enlist_num) as enlistNum
-        </if>
+        IFNULL(sum(enlist_num),0) as enlistNum
         from ta_building_dynamic
     </select>
 

src/main/resources/mapper/TaBuildingMapper.xml

@@ -27,12 +27,12 @@
 
     <select id="selectBuildingStatistical" resultType="map">
         select
-          sum(pv_num) as pvNum,
-          <if test="saveOrShare === 'save'">
-              sum(save_num) as saveNum
+        IFNULL(sum(pv_num), 0) as pvNum,
+          <if test="saveOrShare == 'save'">
+              IFNULL(sum(save_num),0) as saveNum
           </if>
-          <if test="saveOrShare === 'share'">
-              sum(share_num) as shareNum
+          <if test="saveOrShare == 'share'">
+              IFNULL(sum(share_num),0) as shareNum
           </if>
         from ta_building
     </select>

src/main/resources/mapper/TaNewsMapper.xml

@@ -6,10 +6,10 @@
     <select id="selectNewsStatistical" resultType="map" >
         select
         sum(pv_num) as pvNum,
-        <if test="saveOrShare === 'save'">
+        <if test="saveOrShare == 'save'">
             sum(save_num) as saveNum
         </if>
-        <if test="saveOrShare === 'share'">
+        <if test="saveOrShare == 'share'">
             sum(share_num) as shareNum
         </if>
         from ta_news

src/main/resources/mapper/TaPersonMapper.xml

@@ -140,9 +140,9 @@ FROM
     </select>
 
 
-    <select id="selectRecentlyCount" >
+    <select id="selectRecentlyCount" resultType="integer" >
         SELECT
-          SUM(activity_count)
+          SUM(activity_count) as activity_count
         FROM
         (
             SELECT
@@ -164,7 +164,7 @@ FROM
             FROM
             ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where tp.person_type != #{personType}
+            where ifnull(tp.person_type, '') != #{personType}
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
     </select>
 
@@ -190,11 +190,12 @@ FROM
             SELECT
             COUNT(1) as activityCount,
             tpvr.visit_time AS visitTime,
-            tpvr.activity as activity
+            tbet.type_name as activity
             FROM
             ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where tp.person_type != #{personType}
+            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>
@@ -205,13 +206,13 @@ FROM
         FROM
         (
             SELECT
-              <if test="dateType === 'day'">
+              <if test="dateType == 'day'.toString()">
                   DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum DAY ), '%Y-%m-%d' ) AS date
               </if>
-              <if test="dateType === 'week'">
+              <if test="dateType == 'week'.toString()">
                   DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum WEEK ), '%Y-%m-%d' ) AS date
               </if>
-              <if test="dateType === 'month'">
+              <if test="dateType == 'month'.toString()">
                   DATE_FORMAT( DATE_SUB( now( ), INTERVAL a.rownum MONTH ), '%Y-%m-%d' ) AS date
               </if>
             FROM
@@ -231,7 +232,7 @@ FROM
             FROM
                ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-             where tp.person_type != #{personType}
+             where ifnull(tp.person_type, '') != #{personType}
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
     </select>
 
@@ -265,7 +266,7 @@ FROM
                 FROM
                 ta_person tp
                 INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-                where tp.person_type != #{personType}
+                where ifnull(tp.person_type, '') != #{personType}
                 and tp.phone is NOT NULL
             ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
         ) as authorization_count_table
@@ -293,17 +294,17 @@ FROM
             FROM
             ta_person tp
             INNER JOIN ta_person_visit_record tpvr ON tp.person_id = tpvr.person_id
-            where tp.person_type != #{personType}
+            where ifnull(tp.person_type, '') != #{personType}
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.visit_time , '%Y-%m-%d' )
 
         ) as user_count_table
         GROUP BY date
     </select>
 
-    <select id="selectUserSourcePie">
+    <select id="selectUserSourcePie" resultType="integer">
         select count(1)
         FROM ta_person
-        WHERE person_type != #{personType}
+        WHERE ifnull(person_type, '') != #{personType}
         <if test="recommendPersonType != null and recommendPersonType != ''">
             and recommend_person_type = #{recommendPersonType}
         </if>
@@ -319,12 +320,12 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code and tps.phone is NOT NULL
-            and tps.person_type != #{personType}
+            and ifnull(tps.person_type, '') != #{personType}
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
             <if test="startDate == null or endDate == null">
-                and tps.create_date BETWEEN DATE_SUB( tp.create_date, INTERVAL 7 DAY ) and now()
+                and tps.create_date BETWEEN DATE_SUB( tps.create_date, INTERVAL 7 DAY ) and now()
             </if>
         ) as registered,
         (
@@ -334,21 +335,54 @@ FROM
             LEFT JOIN td_person_from tpfs
             ON tps.from_code = tpfs.from_code
             WHERE tpfs.from_code = tpf.from_code
-            and tps.person_type != #{personType}
+            and ifnull(tps.person_type, '') != #{personType}
             <if test="startDate != null or endDate != null">
                 and tps.create_date BETWEEN #{startDate} and #{endDate}
             </if>
             <if test="startDate == null or endDate == null">
-                and tps.create_date BETWEEN DATE_SUB( tp.create_date, INTERVAL 7 DAY ) and now()
+                and tps.create_date BETWEEN DATE_SUB( tps.create_date, INTERVAL 7 DAY ) and now()
             </if>
         ) as user_count
 
         FROM td_person_from tpf
         LEFT JOIN ta_person tp
         ON tp.from_code = tpf.from_code
-        where tp.person_type != #{personType}
+        where ifnull(tp.person_type, '') != #{personType}
         GROUP BY tpf.from_code
     </select>
 
+    <select id="selectUserSourceData" resultType="map">
+        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 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
+            WHERE tpfs.from_code = tps.from_code
+              and ifnull(tps.person_type, '') != #{personType}
+            GROUP BY tpfs.from_code
+        ) as user_count
+        ON DATE_FORMAT(user_count.create_date,'%Y-%m-%d') =  temp_date.date
+    </select>
 
 </mapper>