fix

src/main/java/com/huiju/estateagents/controller/TdPointsRulesController.java

@@ -118,6 +118,7 @@ public class TdPointsRulesController extends BaseController {
             queryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
             Integer orgId = getOrgId(request);
             queryWrapper.eq(orgId != null,"org_id",orgId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             if(null != type){
                 if (CommConstant.POINTS_RULE_PLATFORM.equals(type)) {
                     queryWrapper.isNull("building_id");

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

@@ -1105,7 +1105,7 @@
         ) 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
+            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
             FROM ta_share_count a where a.tagert_type in (
             'activity', 'group','h5','help','liveApp','livePost')
             and a.org_id = #{orgId}
@@ -1122,7 +1122,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
+            group by a.be_share,a.tagert_type order by a.create_date desc limit 9999999
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -1317,7 +1317,7 @@
         ) 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
+        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
         FROM ta_share_count a where a.tagert_type in (
         'activity', 'group','h5','help','liveApp','livePost')
         and a.org_id = #{orgId}
@@ -1334,7 +1334,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
+        group by a.be_share,a.tagert_type order by a.create_date desc limit 9999999
         ) as shareNum on shareNum.be_share = activity.activityId and shareNum.tagert_type = activity.activityType
 
         left join (
@@ -2002,7 +2002,7 @@
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
         </if>
-        group by t.person_id
+        group by t.person_id order by t.create_date desc
     </select>
 
     <select id="selectActivityAddRegistNumExport"
@@ -2012,18 +2012,18 @@
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
         a.province,
         b1.scene_alias as personFrom,
-        GROUP_CONCAT(c.name) as realtyConsultant,
-        ifnull(d.phone, d.tel) as realtyConsultantPhone,
-        ifnull(e.nickname, f.user_name) as sharePersonName,
-        ifnull(e.phone, e.tel) as sharePersonPhone
+        GROUP_CONCAT(d.user_name) as realtyConsultant,
+        d.phone as realtyConsultantPhone,
+        ifnull(e.nickname, f.name) as sharePersonName,
+        ifnull(e.phone, f.phone) as sharePersonPhone
         FROM ta_share_person_from 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} 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_person d on c.recommend_person = d.person_id
-        left join ta_person e on t.share_person = e.person_id
-        left join ta_user f on t.share_person = f.user_id
+        LEFT JOIN ta_user d ON c.realty_consultant = d.user_id
+        LEFT JOIN ta_person e ON t.share_person = e.person_id
+        LEFT JOIN ta_person f ON t.share_person = f.user_id
         WHERE t.target_type in ('dynamic_share','h5_share','help_share','live_share', 'group_share') and t.org_id =
         #{orgId} and t.status = 1
         and t.is_first_time = 1
@@ -2044,7 +2044,7 @@
         <if test="buildingId != null and buildingId != ''">
             and c.building_id = #{buildingId}
         </if>
-        group by t.person_id
+        group by t.person_id order by t.create_date desc
     </select>
 
     <select id="selectActivityVisitNum" resultType="com.huiju.estateagents.excel.ActivityStatistics.VisitNum">