Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -852,7 +852,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
         List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() > 10){
+        if (taBuildings != null && taBuildings.size() >= 10){
             return false;
         }
         return true;

src/main/resources/mapper/HelpActivityMapper.xml

@@ -142,7 +142,7 @@
                     and t.building_id = #{buildingId}
                 </if>
             )
-            order by heavy
+            order by heavy desc
     </select>
 
     <select id="helpActivityListEffectivePage" resultType="com.huiju.estateagents.entity.HelpActivity">

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -180,25 +180,28 @@
 
     <select id="getConsultantShareInfoList" resultType="com.huiju.estateagents.entity.TaConsultantInfo">
         select * From (
-        select
-        t.target_id,
-        a.url as activity_img,
-        a.building_name as activity_name,
-        a.building_name,
-        a.address,
-        a.price,
-        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'
-        and t.consultant_id = #{userId}
-        and t.org_id = #{orgId}
-        and t.`event` = 'share'
-        group by t.target_id
+            select * from (
+                select
+                t.target_id,
+                a.url as activity_img,
+                a.building_name as activity_name,
+                a.building_name,
+                a.address,
+                a.price,
+                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'
+                and t.consultant_id = #{userId}
+                and t.org_id = #{orgId}
+                and t.`event` = 'share' order by t.visit_time desc
+            ) t
+            group by t.target_id
 
         union all
 
+        select * from (
         select
         t.target_id,
         b.list_img_url as activity_img,
@@ -213,11 +216,13 @@
         where t.event_type = 'activity'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        and t.`event` = 'share'
+        and t.`event` = 'share' order by t.visit_time desc
+        ) t
         group by t.target_id
 
         union all
 
+        select * from (
         select
         t.target_id,
         c.list_img as activity_img,
@@ -232,11 +237,13 @@
         where t.event_type = 'help'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        and t.`event` = 'share'
+        and t.`event` = 'share' order by t.visit_time desc
+        ) t
         group by t.target_id
 
         union all
 
+        select * from (
         select
         t.target_id,
         d.list_img as activity_img,
@@ -252,10 +259,12 @@
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
         and t.`event` = 'share'
-        group by t.target_id
+        group by t.target_id order by t.visit_time desc
+        ) t
 
         union all
 
+        select * from (
         select
         t.target_id,
         e.news_img as activity_img,
@@ -270,27 +279,32 @@
         where t.event_type = 'news'
         and t.consultant_id = #{userId}
         and t.org_id = #{orgId}
-        and t.`event` = 'share'
+        and t.`event` = 'share' order by t.visit_time desc
+        ) t
         group by t.target_id
 
         union all
 
-        select
-        t.target_id,
-        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.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 ) t order by t.visit_time desc
+        select * from (
+            select
+            t.target_id,
+            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.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' order by t.visit_time desc
+            ) t
+            group by t.target_id
+        ) t
+        order by t.visit_time desc
     </select>
 
     <select id="countShareNumByEventType" resultType="java.lang.Integer">