报表bug 修复

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

@@ -139,7 +139,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -169,7 +169,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -394,7 +394,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -451,7 +451,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -505,7 +505,7 @@
         FROM
         ta_customer_from t
         WHERE
-        t.target_type IN ( 'dynamic', 'h5', 'help', 'live', 'group', 'activity' )
+        t.target_type IN ( 'dymic', 'h5', 'help', 'live', 'group', 'activity' )
         AND t.org_id = #{orgId}
         and t.is_org_first = 1
         <if test="buildingId != null and buildingId != ''">
@@ -682,7 +682,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -716,7 +716,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' when #{targetType} = 'h5' then t.event_type = 'h5' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -746,7 +746,7 @@
         FROM
         ta_customer_from t
         WHERE
-        t.target_type in ('dynamic','h5','help','live', 'group', 'activity') and t.org_id = #{orgId}
+        t.target_type in ('dymic','h5','help','live', 'group', 'activity') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
@@ -916,7 +916,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -950,7 +950,7 @@
             and t.building_id = #{buildingId}
         </if>
         <if test="targetType != null and targetType != ''">
-            and (case when #{targetType} = 'activity' then t.target_type = 'dynamic' else t.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then t.target_type = 'dymic' else t.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -980,7 +980,7 @@
         FROM
         ta_customer_from t
         WHERE
-        t.target_type in ('dynamic','h5','help','live', 'group', 'activity') and t.org_id = #{orgId}
+        t.target_type in ('dymic','h5','help','live', 'group', 'activity') and t.org_id = #{orgId}
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
@@ -1105,8 +1105,7 @@
         left join (
             select count(1) as shareNum, a.* from (
             SELECT 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, a.create_date
-            FROM ta_share_count a where a.tagert_type in (
-            'activity', 'group','h5','help','liveApp','livePost')
+            FROM ta_share_count a where a.tagert_type in ('dymic','house','look','live','liveApp','livePost')
             and a.org_id = #{orgId}
             <if test="targetType != null and targetType != ''">
                 and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
@@ -1127,7 +1126,7 @@
         left join (
         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')
+        From ta_share_count a where a.tagert_type in ('dymic','house','look','live','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
             and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
@@ -1149,11 +1148,11 @@
         activity.activityType
 
         left join (
-            select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
+            select count(*) as visitNum, a.target_id, case when a.target_type = 'dymic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
             From ta_person_visit_record a where a.event_type in
             ('dymic','house','look','live')  and a.`event` = 'detail' and a.org_id = #{orgId}
             <if test="targetType != null and targetType != '' and targetType != 'h5'">
-                and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+                and (case when #{targetType} = 'activity' then a.target_type = 'dymic' else a.target_type = #{targetType}
                 end)
             </if>
             <if test="startDate != null">
@@ -1169,11 +1168,11 @@
         ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
+            SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dymic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
             From ta_person_visit_record a where a.event_type in ('dymic','house','look','live')  and a.`event` =
             'detail' and a.org_id = #{orgId}
             <if test="targetType != null and targetType != '' and targetType != 'h5'">
-                and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+                and (case when #{targetType} = 'activity' then a.target_type = 'dymic' else a.target_type = #{targetType}
                 end)
             </if>
             <if test="startDate != null">
@@ -1191,7 +1190,7 @@
 
         left join (
         select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
-        select count(*), a.* From ta_customer_from a where a.target_type IN ( 'dynamic', 'h5',
+        select count(*), a.* From ta_customer_from a where a.target_type IN ( 'dymic', 'h5',
         'help', 'live', 'group', 'activity' ) and a.org_id = #{orgId}
         and a.is_org_first = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
@@ -1318,8 +1317,7 @@
         select count(1) as shareNum, a.* from (
 
         SELECT 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, a.create_date
-        FROM ta_share_count a where a.tagert_type in (
-        'activity', 'group','h5','help','liveApp','livePost')
+        FROM ta_share_count a where a.tagert_type in ('dymic','house','look','live','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
             and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
@@ -1340,7 +1338,7 @@
         left join (
         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')
+        From ta_share_count a where a.tagert_type in ('dymic','house','look','live','liveApp','livePost')
         and a.org_id = #{orgId}
         <if test="targetType != null and targetType != ''">
             and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
@@ -1362,11 +1360,11 @@
         activity.activityType
 
         left join (
-        select count(*) as visitNum, a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
+        select count(*) as visitNum, a.target_id, case when a.target_type = 'dymic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as target_type
         From ta_person_visit_record a where a.event_type in
         ('dymic','house','look','live')  and a.`event` = 'detail' and a.org_id = #{orgId}
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then a.target_type = 'dymic' else a.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -1382,11 +1380,11 @@
         ) as visitNum on visitNum.target_id = activity.activityId and visitNum.target_type = activity.activityType
 
         left join (
-        SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dynamic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
+        SELECT count(DISTINCT(a.person_id)) as visitPersonNum , a.target_id, case when a.target_type = 'dymic' then 'activity' when a.target_type is null then 'h5' else a.target_type end as event_type
         From ta_person_visit_record a where a.event_type in ('dymic','house','look','live')  and a.`event` =
         'detail' and a.org_id = #{orgId}
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and (case when #{targetType} = 'activity' then a.target_type = 'dynamic' else a.target_type = #{targetType}
+            and (case when #{targetType} = 'activity' then a.target_type = 'dymic' else a.target_type = #{targetType}
             end)
         </if>
         <if test="startDate != null">
@@ -1404,11 +1402,11 @@
 
         left join (
         select count(*) as addRegistNum ,addRegistNum.target_id, addRegistNum.target_type From (
-        select count(*), a.* From ta_customer_from a where a.target_type IN ( 'dynamic', 'h5',
+        select count(*), a.* From ta_customer_from a where a.target_type IN ( 'dymic', 'h5',
         'help', 'live', 'group', 'activity') and a.org_id = #{orgId}
         and a.is_org_first = 1
         <if test="targetType != null and targetType != '' and targetType != 'h5'">
-            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dynamic'), '_share')
+            and a.target_type = concat(REPLACE(#{targetType}, 'activity', 'dymic'), '_share')
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1554,7 +1552,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and t.org_id = #{orgId} group by t.share_person) t
         left join ta_person a on t.share_person = a.person_id
@@ -1573,7 +1571,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
         and t.org_id = #{orgId}
@@ -1715,7 +1713,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and t.org_id = #{orgId} ) t
         left join ta_person a on t.share_person = a.person_id
@@ -1734,7 +1732,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
         and t.org_id = #{orgId}
@@ -1983,7 +1981,7 @@
         left join ta_recommend_customer c on c.person_id = t.person_id and c.realty_consultant is not null
         LEFT JOIN ta_user d ON c.realty_consultant = d.user_id
         LEFT JOIN ta_person e ON t.share_person_id = e.person_id
-        WHERE t.target_type in ('dynamic','h5','help','live', 'group','activity') and t.org_id =
+        WHERE t.target_type in ('dymic','h5','help','live', 'group','activity') and t.org_id =
         #{orgId}
         and t.is_org_first = 1
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
@@ -2024,7 +2022,7 @@
         left join ta_recommend_customer c on c.person_id = t.person_id
         LEFT JOIN ta_user d ON c.realty_consultant = d.user_id
         LEFT JOIN ta_person e ON t.share_person_id = e.person_id
-        WHERE t.target_type in ('dynamic','h5','help','live', 'group','activity') and t.org_id =
+        WHERE t.target_type in ('dymic','h5','help','live', 'group','activity') and t.org_id =
         #{orgId}
         and t.is_org_first = 1
         and t.create_date >= DATE_FORMAT(#{startDate}, '%Y-%m-%d' ) and t.create_date &lt;= DATE_FORMAT(#{endDate},
@@ -2070,7 +2068,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dymic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -2133,7 +2131,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dymic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -2202,7 +2200,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dymic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -2269,7 +2267,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and (case when #{activityType} = 'activity' then t.target_type = 'dynamic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
+            and (case when #{activityType} = 'activity' then t.target_type = 'dymic' when #{activityType} = 'h5' then t.event_type = 'h5' else t.target_type = #{activityType}
             end)
         </if>
         <if test="buildingId != null and buildingId != ''">
@@ -2322,7 +2320,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
@@ -2368,7 +2366,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and
         (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})
@@ -2406,7 +2404,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
@@ -2453,7 +2451,7 @@
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
+            and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dymic'), '_share')
         </if>
         and
         (t.share_person = (select b.user_id from ta_person t left join ta_user b on t.user_id = b.user_id where t.person_id = #{personId})