Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

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

@@ -990,7 +990,8 @@
             'activity', 'group','h5','help','liveApp','livePost')
             and a.org_id = #{orgId}
             <if test="targetType != null and targetType != ''">
-                and a.tagert_type = #{targetType}
+                and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
+                end)
             </if>
             <if test="startDate != null ">
                 and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )
@@ -1010,7 +1011,8 @@
         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}
+            and (case when #{targetType} = 'live' then a.tagert_type in ('liveApp', 'livePost') else a.tagert_type = #{targetType}
+            end)
         </if>
         <if test="startDate != null ">
             and a.create_date &gt;= DATE_FORMAT(#{startDate}, '%Y-%m-%d %H:%i:%S' )