fix

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

@@ -37,12 +37,12 @@ public class ShareNum {
     @ExcelProperty(value = "分享时间", index = 3)
     private String shareTime;
 
-    /**
-     * 访问人数
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "访问人数", index = 4)
-    private Integer visitPersonNum;
+//    /**
+//     * 访问人数
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "访问人数", index = 4)
+//    private Integer visitPersonNum;
 
     @ExcelIgnore
     private String sharePersonId;

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

@@ -56,23 +56,31 @@ public class VisitPersonNum {
     private String realtyConsultantPhone;
 
     /**
-     * 分享者
+     * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "分享者", index = 7)
+    @ExcelProperty(value = "推广人", index = 7)
     private String sharePersonName;
-
-    /**
-     * 分享者电话
-     */
-    @ColumnWidth(15)
-    @ExcelProperty(value = "分享者电话", index = 8)
-    private String sharePersonPhone;
+//    /**
+//     * 分享者
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者", index = 7)
+//    private String sharePersonName;
+//
+//    /**
+//     * 分享者电话
+//     */
+//    @ColumnWidth(15)
+//    @ExcelProperty(value = "分享者电话", index = 8)
+//    private String sharePersonPhone;
 
     /**
      * 访问次数
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "访问次数", index = 9)
+    @ExcelProperty(value = "访问次数", index = 8)
     private String visitNum;
+
+
 }

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

@@ -1210,7 +1210,7 @@
         </if>
         group by a.person_id, a.target_type ,a.target_id
         ) as addRegistNum group by addRegistNum.target_type, addRegistNum.target_id
-        ) as addRegistNum on addRegistNum.target_id = activity.activityId and REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity') = activity.activityType
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = substring_index(REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity_share') , '_share', 1)
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
@@ -1422,7 +1422,7 @@
         </if>
         group by a.person_id, a.target_type ,a.target_id
         ) as addRegistNum group by addRegistNum.target_type, addRegistNum.target_id
-        ) as addRegistNum on addRegistNum.target_id = activity.activityId and REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity') = activity.activityType
+        ) as addRegistNum on addRegistNum.target_id = activity.activityId and activity.activityType  = substring_index(REPLACE(addRegistNum.target_type, 'dynamic_share', 'activity_share') , '_share', 1)
         <if test="targetType != null and targetType != ''">
             where activity.activityType = #{targetType}
         </if>
@@ -1516,8 +1516,8 @@
         ) as person
 
         left join (
-            select * from (
-                SELECT count(*) as shareNum, t.person_id
+            select count(*) as shareNum, temp.person_id from (
+                SELECT 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
@@ -1536,8 +1536,8 @@
                     and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
                     end)
                 </if>
-                group by person_id
-            ) as temp
+                order by t.create_date desc limit 999999
+            ) as temp group by temp.person_id order by temp.create_date desc
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
@@ -1677,8 +1677,8 @@
         ) as person
 
         left join (
-        select * from (
-        SELECT count(*) as shareNum, t.person_id
+        select count(*) as shareNum, temp.person_id from (
+        SELECT 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
@@ -1697,8 +1697,8 @@
             and (case when #{activityType} = 'live' then t.tagert_type in ('liveApp', 'livePost') else t.tagert_type = #{activityType}
             end)
         </if>
-        group by person_id
-        ) as temp
+        order by t.create_date desc limit 999999
+        ) as temp group by temp.person_id order by temp.create_date desc
         ) as shareNum on person.person_id = shareNum.person_id
 
         left join (
@@ -2181,7 +2181,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         from (
         SELECT
@@ -2214,12 +2214,11 @@
         GROUP BY
         t.person_id ) as 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 = #{orgId}
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time = 1
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         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 e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
                 and b.scene_type = #{personFrom}
@@ -2248,7 +2247,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         from (
         SELECT
@@ -2285,8 +2284,7 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         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 e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         <where>
             <if test="personFrom != null and personFrom != ''">
                 and b.scene_type = #{personFrom}
@@ -2315,7 +2313,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
@@ -2341,8 +2339,7 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         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 e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         group by t.person_id
     </select>
 
@@ -2400,7 +2397,7 @@
         GROUP_CONCAT(d.user_name) as realtyConsultant,
         GROUP_CONCAT(d.phone) as realtyConsultantPhone,
         t.create_date as visitDate,
-        ifnull(e.nickName, f.user_name) as sharePersonName,
+        e.nickName as sharePersonName,
         t.visitNum
         From (
         SELECT count(1) as visitNum, t.person_id, t.create_date
@@ -2426,8 +2423,7 @@
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
         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 e.person_id = c.recommend_person
-        left join ta_user f on f.user_id = c.recommend_person
+        LEFT JOIN ta_person e ON e.person_id = b.share_person_id
         group by t.person_id
     </select>