fix

src/main/java/com/huiju/estateagents/excel/IntentionUser.java

@@ -56,39 +56,39 @@ public class IntentionUser {
     @ExcelProperty(value = "置业顾问电话", index = 6)
     private String realtyConsultantPhone;
 
-    /**
-     * 分享者
-     */
-    @ColumnWidth(15)
-    @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 = 7)
     private String gender;
 
     /**
      * 来源
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "用户来源", index = 10)
+    @ExcelProperty(value = "用户来源", index = 8)
     private String personFrom;
 
     /**
      * 推广人
      */
     @ColumnWidth(15)
-    @ExcelProperty(value = "推广人", index =11)
+    @ExcelProperty(value = "推广人", index = 9)
     private String recommendPerson;
 
 }

src/main/resources/mapper/TaPersonIntentionRecordMapper.xml

@@ -60,7 +60,7 @@
 
         FROM ta_person_intention_record tpir
         LEFT JOIN ta_person tp ON tpir.person_id = tp.person_id
-        left join ta_recommend_customer c on c.person_id = tpir.person_id
+        left join ta_recommend_customer c on c.person_id = tpir.person_id and c.building_id = tpir.building_id
         left join ta_user d on c.realty_consultant = d.user_id
         <trim prefix="where" prefixOverrides="and | or">
             <if test="orgId != null">

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

@@ -1105,7 +1105,8 @@
         ) as activity
 
         left join (
-            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, a.create_date
+            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')
             and a.org_id = #{orgId}
@@ -1122,7 +1123,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.be_share,a.tagert_type order by a.create_date desc limit 9999999
+            order by a.create_date desc limit 9999999) as a group by a.be_share,a.tagert_type order by a.create_date desc
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -1216,7 +1217,7 @@
         </if>
         group by activity.activityId, activity.activityType
         <if test="colKey == null or colKey == ''">
-            order by sharePersonNum.create_date desc
+            order by shareNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
             ORDER BY ${colKey} ${sortType}
@@ -1317,7 +1318,9 @@
         ) as activity
 
         left join (
-        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, a.create_date
+        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')
         and a.org_id = #{orgId}
@@ -1334,7 +1337,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.be_share,a.tagert_type order by a.create_date desc limit 9999999
+        order by a.create_date desc limit 9999999) as a group by a.be_share,a.tagert_type order by a.create_date desc
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -1428,7 +1431,7 @@
         </if>
         group by activity.activityId, activity.activityType
         <if test="colKey == null or colKey == ''">
-            order by sharePersonNum.create_date desc
+            order by shareNum.create_date desc
         </if>
         <if test="colKey != null and colKey != ''">
             ORDER BY ${colKey} ${sortType}
@@ -1971,7 +1974,7 @@
         a.province,
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        group_concat(d.phone) as realtyConsultantPhone,
         ifnull(e.nickname, f.name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from t
@@ -2013,7 +2016,7 @@
         a.province,
         b1.scene_alias as personFrom,
         GROUP_CONCAT(d.user_name) as realtyConsultant,
-        d.phone as realtyConsultantPhone,
+        group_concat(d.phone) as realtyConsultantPhone,
         ifnull(e.nickname, f.name) as sharePersonName,
         ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from t