bug fix

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

@@ -985,30 +985,29 @@
         ) as activity
 
         left join (
-        select * from (
-        select count(*) as shareNum, a.be_share, a.tagert_type From ta_share_count a where a.tagert_type in (
-        'activity', 'group','h5','help','liveApp','livePost')
-        and a.org_id = #{orgId}
-        <if test="targetType != null and targetType != ''">
-            and a.tagert_type = #{targetType}
-        </if>
-        <if test="startDate != null ">
-            and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
-        </if>
-        <if test="endDate != null ">
-            and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
-        </if>
-        <if test="startDate == null or endDate == null ">
-            AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-        </if>
-        group by a.be_share, tagert_type
-        ) as a
+            SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type
+            FROM ta_share_count a where a.tagert_type in (
+            'activity', 'group','h5','help','liveApp','livePost')
+            and a.org_id = #{orgId}
+            <if test="targetType != null and targetType != ''">
+                and a.tagert_type = #{targetType}
+            </if>
+            <if test="startDate != null ">
+                and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="endDate != null ">
+                and a.create_date &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="startDate == null or endDate == null ">
+                AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            group by a.be_share
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
-        select count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type,
-        sharePersonNum.create_date from (
-        select a.* From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
+        SELECT count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type, sharePersonNum.create_date from (
+        SELECT a.be_share, a.create_date ,case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end   as tagert_type
+        From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
             and a.tagert_type = #{targetType}
@@ -1028,45 +1027,43 @@
         activity.activityType
 
         left join (
-        select * from (
-        select count(*) as visitNum, a.target_id, a.event_type From ta_person_visit_record a where a.event_type in
-        ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
-        <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
-            end)
-        </if>
-        <if test="startDate != null">
-            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
-        </if>
-        <if test="endDate != null">
-            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
-        </if>
-        <if test="startDate == null or endDate == null ">
-            AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-        </if>
-        group by a.target_id, a.event_type
-        ) as a
-        ) as visitNum on visitNum.target_id = activity.activityId and visitNum.event_type = activity.activityType
+            select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' else a.target_type end as target_type
+            From ta_person_visit_record a where a.event_type in
+            ('activity','group','h5','help') and a.`event` = 'detail' and a.org_id = #{orgId}
+            <if test="targetType != null and targetType != ''">
+                and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+                end)
+            </if>
+            <if test="startDate != null">
+                and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="endDate != null">
+                and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="startDate == null or endDate == null ">
+                AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            group by a.target_id, a.event_type
+        ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-        select count(*) as visitPersonNum ,visitPersonNum.target_id, visitPersonNum.event_type from (
-        select a.* From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
-        'detail' and a.org_id = #{orgId}
-        <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
-            end)
-        </if>
-        <if test="startDate != null">
-            and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
-        </if>
-        <if test="endDate != null">
-            and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
-        </if>
-        <if test="startDate == null or endDate == null ">
-            AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
-        </if>
-        group by a.person_id, a.target_id, a.event_type
-        ) as visitPersonNum group by visitPersonNum.target_id, visitPersonNum.event_type
+            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' else a.target_type end as event_type
+            From ta_person_visit_record a where a.event_type in ('activity','group','h5','help') and a.`event` =
+            'detail' and a.org_id = #{orgId}
+            <if test="targetType != null and targetType != ''">
+                and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+                end)
+            </if>
+            <if test="startDate != null">
+                and a.visit_time &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="endDate != null">
+                and a.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%i:%S' )
+            </if>
+            <if test="startDate == null or endDate == null ">
+                AND a.visit_time BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
+            </if>
+            group by a.target_id, a.event_type
         ) as visitPersonNum on visitPersonNum.target_id = activity.activityId and visitPersonNum.event_type =
         activity.activityType
 
@@ -1200,8 +1197,8 @@
         ) as activity
 
         left join (
-        select * from (
-        select count(*) as shareNum, a.be_share, a.tagert_type From ta_share_count a where a.tagert_type in (
+        SELECT count(1) as shareNum, a.be_share, case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end as tagert_type
+        FROM ta_share_count a where a.tagert_type in (
         'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="startDate != null ">
@@ -1213,14 +1210,13 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.be_share, tagert_type
-        ) as a
+        group by a.be_share
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
         select count(*) as sharePersonNum ,sharePersonNum.be_share, sharePersonNum.tagert_type,
         sharePersonNum.create_date from (
-        select a.* From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
+        SELECT a.be_share, a.create_date ,case when a.tagert_type = 'liveApp' then 'live' when a.tagert_type = 'livePost' then 'live' else a.tagert_type end   as tagert_type From ta_share_count a where a.tagert_type in ( 'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d' )
@@ -1372,21 +1368,27 @@
         ) as person
 
         left join (
-        select * from (
-        SELECT count(*) as shareNum, 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}
-        and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
-        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
-        group by person_id
-        ) as temp
+            select * from (
+                SELECT count(*) as shareNum, 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}
+                and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
+                DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+                <if test="activityId != null and activityId != ''">
+                    and t.be_share = #{activityId}
+                </if>
+                <if test="activityType != null and activityType != ''">
+                    and t.tagert_type = #{activityType}
+                </if>
+                group by person_id
+            ) as temp
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
@@ -1517,6 +1519,12 @@
         WHERE t.tagert_type in ('activity','group','h5','help','liveApp','livePost') and t.org_id = #{orgId}
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%I:%S' ) and t.create_date &lt;=
         DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
+        <if test="activityId != null and activityId != ''">
+            and t.be_share = #{activityId}
+        </if>
+        <if test="activityType != null and activityType != ''">
+            and t.tagert_type = #{activityType}
+        </if>
         group by person_id
         ) as temp
         ) as shareNum on person.person_id = shareNum.person_id
@@ -1848,7 +1856,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.event_type = #{activityType}
+            and t.target_type = #{activityType}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -1905,7 +1913,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.event_type = #{activityType}
+            and t.target_type = #{activityType}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -1970,7 +1978,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.event_type = #{activityType}
+            and t.target_type = #{activityType}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
@@ -2036,7 +2044,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.event_type = #{activityType}
+            and t.target_type = #{activityType}
         </if>
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}