新需求

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

@@ -316,15 +316,18 @@ public class TaPerson implements Serializable {
     /**
      * 访问内容类型
      */
+    @TableField(exist = false)
     private String targetType;
 
     /**
      * 访问内容ID
      */
+    @TableField(exist = false)
     private String targetId;
 
     /**
      * 访问内容名称
      */
+    @TableField(exist = false)
     private String targetName;
 }

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

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

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

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

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

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

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

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

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

@@ -163,36 +163,43 @@
             </trim>
         ) AS temp_date
         LEFT JOIN (
-                select temp1.user_count, temp1.create_date from (
-                SELECT COUNT( 1 ) AS user_count, t.create_date AS create_date, t.person_id
-                FROM
-                ta_share_count t
-                left join ta_help_activity a on t.be_share = a.help_activity_id
-                left join ta_share_activity b on t.be_share = b.share_id
-                left join ta_live_activity c on t.be_share = c.live_activity_id
-                left join ta_drainage d on t.be_share = d.drainage_id
-                left join ta_building_dynamic e on t.be_share = e.dynamic_id
-                left join ta_person f on t.person_id = f.person_id
-                WHERE
-                t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
-                <if test="buildingId != null and buildingId != ''">
-                    and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
-                </if>
-                <if test="targetType != null and targetType != ''">
-                    and t.tagert_type = #{targetType}
-                </if>
-                <if test="startDate != null ">
-                    and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
-                </if>
-                <if test="endDate != null ">
-                    and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
-                </if>
-                <if test="startDate == null or endDate == null ">
-                    AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-                </if>
-                GROUP BY t.person_id
-                ) as temp1
-            ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
+            SELECT count(1) as user_count , temp1.*
+            FROM (
+            SELECT DISTINCT(t.person_id),t.create_date
+            FROM ta_share_count t
+            LEFT JOIN ta_help_activity a
+            ON t.be_share = a.help_activity_id
+            LEFT JOIN ta_share_activity b
+            ON t.be_share = b.share_id
+            LEFT JOIN ta_live_activity c
+            ON t.be_share = c.live_activity_id
+            LEFT JOIN ta_drainage d
+            ON t.be_share = d.drainage_id
+            LEFT JOIN ta_building_dynamic e
+            ON t.be_share = e.dynamic_id
+            LEFT JOIN ta_person f
+            ON t.person_id = f.person_id
+            WHERE
+            t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
+            <if test="buildingId != null and buildingId != ''">
+                and (a.building_id = #{buildingId} or b.building_id = #{buildingId} or c.building_id = #{buildingId} or d.building_id = #{buildingId} or e.building_id = #{buildingId})
+            </if>
+            <if test="targetType != null and targetType != ''">
+                and t.tagert_type = #{targetType}
+            </if>
+            <if test="startDate != null ">
+                and t.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="endDate != null ">
+                and t.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="startDate == null or endDate == null ">
+                AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            GROUP BY DATE_FORMAT( t.create_date, '%Y-%m-%d' ) ,t.person_id
+            ) as temp1  GROUP BY DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
+        ) AS temp1 ON temp_date.date = DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
+
         ) AS share_person_count_table
 
         group by date order by date
@@ -229,7 +236,7 @@
             and t.building_id =  #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.target_type =  #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
         </if>
         <if test="startDate != null">
             and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -279,7 +286,7 @@
                 and t.building_id =  #{buildingId}
             </if>
             <if test="targetType != null and targetType != ''">
-                and t.target_type =  #{targetType}
+                and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
             </if>
             <if test="startDate != null">
                 and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -300,11 +307,8 @@
 
     <select id="selectAddRegistCount" resultType="java.util.Map">
         SELECT
-        addRegist_count_table.date AS date,
-        ifnull( addRegist_count_table.user_count, 0 ) AS addRegist_count
-        FROM (
-        SELECT
-        *
+        date,
+        ifnull( addRegistNum, 0 ) AS addRegist_count
         FROM
         (
         SELECT
@@ -319,16 +323,24 @@
         ) AS temp_date
         LEFT JOIN (
         SELECT
-        COUNT( 1 ) AS user_count,
-        t.create_date AS create_date
+        count( * ) AS addRegistNum,
+        temp4.*
+        FROM
+        (
+        SELECT
+        t.create_date AS create_date,
+        t.person_id
         FROM
         ta_share_person_from t
         WHERE
-        t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id = #{orgId}
+        t.target_type IN ( 'dynamic_share', 'h5_share', 'help_share', 'live_share', 'group_share' )
+        AND t.org_id = #{orgId}
+        AND t.STATUS = 1
+        and t.is_first_time = 1
         <if test="buildingId != null and buildingId != ''">
             and t.building_id =  #{buildingId}
         </if>
-        and t.status = 1
+        and t.status = 1 and t.is_first_time = 1
         <if test="targetType != null and targetType != ''">
             and t.target_type =  #{targetType}
         </if>
@@ -342,11 +354,16 @@
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
         GROUP BY
-        DATE_FORMAT( t.create_date, '%Y-%m-%d' ) ,t.person_id, t.target_type
-        ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
-        ) AS addRegist_count_table
-
-        group by date order by date
+        t.person_id,
+        t.target_type
+        ) AS temp4
+        GROUP BY
+        DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
+        ) AS temp4 ON temp_date.date = DATE_FORMAT( temp4.create_date, '%Y-%m-%d' )
+        GROUP BY
+        date
+        ORDER BY
+        date DESC
     </select>
 
     <select id="selectTableData" resultType="com.huiju.estateagents.excel.ActivityStatistics.StatisicAttractUser">
@@ -396,16 +413,22 @@
         DATE_FORMAT( t.create_date, '%Y-%m-%d' )
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
         LEFT JOIN (
-            select temp1.sharePersonNum, temp1.create_date from (
-                SELECT COUNT( 1 ) AS sharePersonNum, t.create_date AS create_date, t.person_id
-                FROM
-                ta_share_count t
-                left join ta_help_activity a on t.be_share = a.help_activity_id
-                left join ta_share_activity b on t.be_share = b.share_id
-                left join ta_live_activity c on t.be_share = c.live_activity_id
-                left join ta_drainage d on t.be_share = d.drainage_id
-                left join ta_building_dynamic e on t.be_share = e.dynamic_id
-                left join ta_person f on t.person_id = f.person_id
+            SELECT count(1) as sharePersonNum , temp1.*
+            FROM (
+                SELECT DISTINCT(t.person_id),t.create_date
+                FROM ta_share_count t
+                LEFT JOIN ta_help_activity a
+                ON t.be_share = a.help_activity_id
+                LEFT JOIN ta_share_activity b
+                ON t.be_share = b.share_id
+                LEFT JOIN ta_live_activity c
+                ON t.be_share = c.live_activity_id
+                LEFT JOIN ta_drainage d
+                ON t.be_share = d.drainage_id
+                LEFT JOIN ta_building_dynamic e
+                ON t.be_share = e.dynamic_id
+                LEFT JOIN ta_person f
+                ON t.person_id = f.person_id
                 WHERE
                 t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
                 <if test="buildingId != null and buildingId != ''">
@@ -423,8 +446,8 @@
                 <if test="startDate == null or endDate == null ">
                     AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
                 </if>
-                GROUP BY t.person_id, DATE_FORMAT( t.create_date, '%Y-%m-%d' )
-            ) as temp1
+                GROUP BY DATE_FORMAT( t.create_date, '%Y-%m-%d' ) ,t.person_id
+                ) as temp1  GROUP BY DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
         ) AS temp1 ON temp_date.date = DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
         LEFT JOIN (
         SELECT
@@ -438,7 +461,7 @@
             and t.building_id =  #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and t.target_type =  #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
         </if>
         <if test="startDate != null">
             and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -465,7 +488,7 @@
                 and t.building_id =  #{buildingId}
             </if>
             <if test="targetType != null and targetType != ''">
-                and t.target_type =  #{targetType}
+                and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType} end)
             </if>
             <if test="startDate != null">
                 and t.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -493,6 +516,7 @@
                 and t.building_id =  #{buildingId}
             </if>
             and t.status = 1
+            and t.is_first_time = 1
             <if test="targetType != null and targetType != ''">
                 and t.target_type =  #{targetType}
             </if>
@@ -563,16 +587,22 @@
         DATE_FORMAT( t.create_date, '%Y-%m-%d' )
         ) AS temp ON temp_date.date = DATE_FORMAT( temp.create_date, '%Y-%m-%d' )
         LEFT JOIN (
-        select temp1.sharePersonNum, temp1.create_date from (
-        SELECT COUNT( 1 ) AS sharePersonNum, t.create_date AS create_date, t.person_id
-        FROM
-        ta_share_count t
-        left join ta_help_activity a on t.be_share = a.help_activity_id
-        left join ta_share_activity b on t.be_share = b.share_id
-        left join ta_live_activity c on t.be_share = c.live_activity_id
-        left join ta_drainage d on t.be_share = d.drainage_id
-        left join ta_building_dynamic e on t.be_share = e.dynamic_id
-        left join ta_person f on t.person_id = f.person_id
+        SELECT count(1) as sharePersonNum , temp1.*
+        FROM (
+        SELECT DISTINCT(t.person_id),t.create_date
+        FROM ta_share_count t
+        LEFT JOIN ta_help_activity a
+        ON t.be_share = a.help_activity_id
+        LEFT JOIN ta_share_activity b
+        ON t.be_share = b.share_id
+        LEFT JOIN ta_live_activity c
+        ON t.be_share = c.live_activity_id
+        LEFT JOIN ta_drainage d
+        ON t.be_share = d.drainage_id
+        LEFT JOIN ta_building_dynamic e
+        ON t.be_share = e.dynamic_id
+        LEFT JOIN ta_person f
+        ON t.person_id = f.person_id
         WHERE
         t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
@@ -590,8 +620,8 @@
         <if test="startDate == null or endDate == null ">
             AND t.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        GROUP BY t.person_id, DATE_FORMAT( t.create_date, '%Y-%m-%d' )
-        ) as temp1
+        GROUP BY DATE_FORMAT( t.create_date, '%Y-%m-%d' ) ,t.person_id
+        ) as temp1  GROUP BY DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
         ) AS temp1 ON temp_date.date = DATE_FORMAT( temp1.create_date, '%Y-%m-%d' )
         LEFT JOIN (
         SELECT
@@ -660,6 +690,7 @@
             and t.building_id =  #{buildingId}
         </if>
         and t.status = 1
+        and t.is_first_time = 1
         <if test="targetType != null and targetType != ''">
             and t.target_type =  #{targetType}
         </if>
@@ -849,7 +880,13 @@
 
     <select id="selectActivityStatisDetailExport" resultType="com.huiju.estateagents.excel.ActivityStatistics.ActivityDetailShareRecord">
         select
-        activity.*,
+        activity.activityId, activity.activityName,
+        case when activity.activityType = 'activity' then '报名活动'
+        when activity.activityType = 'help' then '助力活动'
+        when activity.activityType = 'group' then '拼团活动'
+        when activity.activityType = 'h5' then 'H5活动'
+        when activity.activityType = 'live' then '直播活动'
+        end as activityType,
         ifnull(shareNum.shareNum, 0) as shareNum,
         ifnull(sharePersonNum.sharePersonNum, 0) as sharePersonNum,
         ifnull(visitNum.visitNum, 0) as visitNum,
@@ -997,14 +1034,14 @@
 
     <select id="selectActivitySharePersonNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.SharePersonNum">
         select person.nickname as sharePersonName,
-               ifnull(person.tel, '空') as sharePersonPhone ,
+               ifnull(person.phone, '空') as sharePersonPhone ,
                ifnull(shareNum, 0) as shareNum,
                ifnull(visitNum, 0) as visitNum,
                ifnull(visitPersonNum, 0) as visitPersonNum,
             person.person_type as sharePersonType,
             person.person_id
             from (
-            SELECT t.*, f.nickname, f.tel, f.person_type
+            SELECT t.*, f.nickname, f.phone, f.person_type
             FROM ta_share_count t
             LEFT JOIN ta_help_activity a
             ON t.be_share = a.help_activity_id
@@ -1033,7 +1070,7 @@
                 and f.nickname = #{sharePersonName}
             </if>
             <if test="sharePhone != null and sharePhone != ''">
-                and f.tel = #{sharePhone}
+                and f.phone = #{sharePhone}
             </if>
             GROUP BY t.person_id
         ) as person
@@ -1092,12 +1129,16 @@
     </select>
     <select id="selectActivitySharePersonNumExport" resultType="com.huiju.estateagents.excel.ActivityStatistics.SharePersonNum">
         select person.nickname as sharePersonName,
-        ifnull(person.tel, '空') as sharePersonPhone ,
+        ifnull(person.phone, '空') as sharePersonPhone ,
         ifnull(shareNum, 0) as shareNum,
         ifnull(visitNum, 0) as visitNum,
         ifnull(visitPersonNum, 0) as visitPersonNum,
-        person.person_type as sharePersonType from (
-        SELECT t.*, f.nickname, f.tel, f.person_type
+        case
+        when person.person_type = 'customer' then '客户'
+        when person.person_type = 'drift' then '游客'
+        when person.person_type = 'Realty Consultant' then '置业顾问'
+        end as sharePersonType from (
+        SELECT t.*, f.nickname, f.phone, f.person_type
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a
         ON t.be_share = a.help_activity_id
@@ -1120,7 +1161,7 @@
             and f.nickname = #{sharePersonName}
         </if>
         <if test="sharePhone != null and sharePhone != ''">
-            and f.tel = #{sharePhone}
+            and f.phone = #{sharePhone}
         </if>
         GROUP BY t.person_id, t.person_id
         ) as person
@@ -1179,12 +1220,12 @@
 
     <select id="selectActivityShareNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.ShareNum">
         select person.nickname as sharePersonName,
-        ifnull(person.tel, '空') as sharePersonPhone ,
+        ifnull(person.phone, '空') as sharePersonPhone ,
         person.create_date as shareTime,
         ifnull(visitPersonNum.visitPersonNum, 0) as visitPersonNum,
         person.person_type as sharePersonType
         FROM (
-            SELECT t.*, f.nickname, f.tel, f.person_type
+            SELECT t.*, f.nickname, f.phone, f.person_type
             FROM ta_share_count t
             LEFT JOIN ta_help_activity a
             ON t.be_share = a.help_activity_id
@@ -1231,7 +1272,7 @@
 
     <select id="selectActivityShareNumExport" resultType="com.huiju.estateagents.excel.ActivityStatistics.ShareNum">
         select person.nickname as sharePersonName,
-        ifnull(person.tel, '空') as sharePersonPhone ,
+        ifnull(person.phone, '空') as sharePersonPhone ,
         person.create_date as shareTime,
         ifnull(visitPersonNum.visitPersonNum, 0) as visitPersonNum,
         CASE
@@ -1243,7 +1284,7 @@
         "置业顾问"
         END `sharePersonType`
         FROM (
-        SELECT t.*, f.nickname, f.tel, f.person_type
+        SELECT t.*, f.nickname, f.phone, f.person_type
         FROM ta_share_count t
         LEFT JOIN ta_help_activity a
         ON t.be_share = a.help_activity_id
@@ -1276,10 +1317,10 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_name as personFrom,
-        d.name as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        GROUP_CONCAT(c.name) as realtyConsultant,
+        ifnull(d.phone, d.tel) as realtyConsultantPhone,
         ifnull(e.nickname, f.user_name) as sharePersonName,
-        e.phone as sharePersonPhone
+        ifnull(e.phone, e.tel) as sharePersonPhone
         FROM ta_share_person_from t
         left join ta_person a on t.person_id = a.person_id
         left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
@@ -1300,6 +1341,7 @@
         <if test="personFrom != null and personFrom != ''">
             and b.scene_id = #{personFrom}
         </if>
+        group by t.person_id
     </select>
 
     <select id="selectActivityAddRegistNumExport" resultType="com.huiju.estateagents.excel.ActivityStatistics.AddRegistNum">