bug fix

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -125,7 +125,7 @@ public class CommConstant {
     public final static String POINTS_CHANGE_DOCUMENT_VERIFY = "document_verify";
 
     /**
-     * 资料审核
+     * 活动签到
      */
     public final static String POINTS_CHANGE_ACTIVITY_CHECKIN = "activity_checkin";
 

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -183,13 +183,15 @@
     </select>
 
     <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
+        select * From (
         select
         a.url as activity_img,
         a.building_name as activity_name,
         a.building_name,
         a.address,
         a.price,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join (select b.url, a.building_name,a.address,a.price,a.building_id from ta_building a left join ta_building_img b on a.building_id = b.building_id where b.img_type = 'list') a on t.target_id = a.building_id
         where t.event_type = 'building'
@@ -197,7 +199,6 @@
         and t.org_id = #{orgId}
         and t.`event` = 'share'
         group by t.target_id
-        order by t.visit_time desc
 
         union all
 
@@ -207,7 +208,8 @@
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_building_dynamic b on t.target_id = b.dynamic_id
         where t.event_type = 'activity'
@@ -215,7 +217,6 @@
         and t.org_id = #{orgId}
         and t.`event` = 'share'
         group by t.target_id
-        order by t.visit_time desc
 
         union all
 
@@ -225,7 +226,8 @@
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_help_activity c on t.target_id = c.help_activity_id
         where t.event_type = 'help'
@@ -233,7 +235,6 @@
         and t.org_id = #{orgId}
         and t.`event` = 'share'
         group by t.target_id
-        order by t.visit_time desc
 
         union all
 
@@ -243,7 +244,8 @@
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_share_activity d on t.target_id = d.group_activity_id
         where t.event_type = 'group'
@@ -251,17 +253,17 @@
         and t.org_id = #{orgId}
         and t.`event` = 'share'
         group by t.target_id
-        order by t.visit_time desc
 
         union all
 
         select
         e.news_img as activity_img,
-        e.news_name,
+        e.news_name as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_news e on t.target_id = e.news_id
         where t.event_type = 'news'
@@ -269,25 +271,24 @@
         and t.org_id = #{orgId}
         group by t.target_id
         and t.`event` = 'share'
-        order by t.visit_time desc
 
         union all
 
         select
-        f.share_img as drainage_img,
-        f.`name` as drainage_name,
+        f.share_img as activity_img,
+        f.`name` as activity_name,
         '1' as price,
         '2' as building_name,
         '3' as address,
-        t.event_type
+        t.event_type,
+		t.visit_time
         from ta_person_visit_record t
         left join ta_drainage f on t.target_id = f.drainage_id
         where t.event_type = 'h5'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        group by t.target_id
-        order by t.visit_time desc
+        group by t.target_id ) t order by t.visit_time desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">