fix

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

@@ -857,7 +857,8 @@
             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' )
@@ -890,7 +891,8 @@
             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' )
@@ -1081,7 +1083,7 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id
+        group by a.person_id, be_share
 <!--        , be_share, tagert_type-->
         ) as sharePersonNum group by sharePersonNum.be_share, sharePersonNum.tagert_type
         ) as sharePersonNum on sharePersonNum.be_share = activity.activityId and sharePersonNum.tagert_type =
@@ -1179,7 +1181,7 @@
             and a.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and a.title = #{activityName}
+            and a.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and a.building_id in
@@ -1194,7 +1196,7 @@
             and b.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and b.title = #{activityName}
+            and b.title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and b.building_id in
@@ -1210,7 +1212,7 @@
             and c.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and c.activity_name = #{activityName}
+            and c.activity_name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and c.building_id in
@@ -1225,7 +1227,7 @@
             and d.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and d.name = #{activityName}
+            and d.name like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and (d.building_id in
@@ -1243,7 +1245,7 @@
             and e.building_id = #{buildingId}
         </if>
         <if test="activityName != null and activityName != '' ">
-            and e.live_activity_title = #{activityName}
+            and e.live_activity_title like concat('%', #{activityName}, '%')
         </if>
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
             and (e.building_id in
@@ -1261,7 +1263,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' )
@@ -1281,7 +1284,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' )
@@ -1292,7 +1296,8 @@
         <if test="startDate == null or endDate == null ">
             AND a.create_date BETWEEN DATE_SUB(now(),INTERVAL 7 DAY) and now()
         </if>
-        group by a.person_id, be_share, tagert_type
+        group by a.person_id, be_share
+        <!--        , be_share, tagert_type-->
         ) as sharePersonNum group by sharePersonNum.be_share, sharePersonNum.tagert_type
         ) as sharePersonNum on sharePersonNum.be_share = activity.activityId and sharePersonNum.tagert_type =
         activity.activityType
@@ -1523,7 +1528,14 @@
         ifnull(shareNum, 0) as shareNum,
         ifnull(visitNum, 0) as visitNum,
         ifnull(visitPersonNum, 0) as visitPersonNum,
-        person.person_type as sharePersonType,
+        CASE
+        WHEN person.person_type = 'drift' THEN
+        "游客"
+        WHEN person.person_type = 'customer' THEN
+        "普通客户"
+        WHEN person.person_type = 'Realty Consultant' THEN
+        "置业顾问"
+        END `sharePersonType`,
         person.person_id
         from (
         SELECT t.*, f.nickname, f.phone, f.person_type
@@ -1645,7 +1657,9 @@
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
         and t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share')
-        and t.org_id = #{orgId} group by t.share_person ) t
+        and t.org_id = #{orgId}
+        <!--        group by t.share_person -->
+        ) t
         left join ta_person a on t.share_person = a.person_id
         left join ta_person b on t.share_person = b.user_id
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
@@ -1779,7 +1793,8 @@
             and t.be_share = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
-            and t.tagert_type = #{activityType}
+            and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
+            end)
         </if>
         <if test="buildingId != null and buildingId != ''">
             and (
@@ -2293,14 +2308,15 @@
         SELECT count(1) as visitNum, t.person_id, t.create_date
         FROM ta_share_person_from t
         WHERE 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' ) and t.target_type in
-        ('dynamic_share','h5_share','help_share','live_share', 'group_share')
+        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' )
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}
         </if>
         <if test="activityType != null and activityType != ''">
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
         </if>
+        and t.target_type in
+        ('dynamic_share','h5_share','help_share','live_share', 'group_share')
         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})
         or t.share_person = #{personId})
@@ -2330,17 +2346,16 @@
         ifnull(e.nickname, f.user_name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         From (
-        SELECT t.person_id, t.create_date
+        SELECT t.person_id, t.create_date, t.share_person
         FROM ta_share_person_from t
         LEFT JOIN (
-        SELECT a.person_id, b.user_id, t.share_person
+        SELECT a.person_id, b.user_id
         FROM ta_person a
         LEFT JOIN ta_user b
         ON a.user_id = b.user_id
         WHERE a.org_id = #{orgId} ) as a ON t.share_person = a.person_id or t.share_person = a.user_id
         WHERE 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' )
-        and t.target_type in
+        DATE_FORMAT(#{endDate}, '%Y-%m-%d %H:%I:%S' ) and t.target_type in
         ('dynamic_share','h5_share','help_share','live_share', 'group_share')
         <if test="activityId != null and activityId != ''">
             and t.target_id = #{activityId}