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

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -167,6 +167,7 @@
         AND e.is_first_time = 1
 
         AND t.phone is not null
+        AND t.person_type != 'Realty Consultant'
 
 <!--        为了与存储过程一致 -->
 <!--        AND t.`status` = 1-->
@@ -177,7 +178,7 @@
         SELECT
             t.*,
             count( * ) as visit_times,
-            MAX(f.visit_time) as visit_time
+            f.visit_time as visit_time
         FROM
             ta_person t
         INNER JOIN ta_person_visit_record f ON f.org_id = #{orgId} AND f.person_id = t.person_id
@@ -195,8 +196,8 @@
 
 <!--        为了与存储过程一致 -->
 <!--            AND s.`status` = 1-->
-        GROUP BY t.person_id, DATE_FORMAT(t.create_date, '%Y%m%d')
-        ORDER BY t.create_date DESC
+        GROUP BY t.person_id, DATE_FORMAT(f.visit_time, '%Y%m%d')
+        ORDER BY f.visit_time DESC
     </select>
 
     <select id="getConsultantHomePageTimes" resultType="com.huiju.estateagents.entity.TaPerson">
@@ -229,7 +230,7 @@
     <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
             t.*,
-            max( h.create_date ) AS visit_time
+            h.create_date AS visit_time
         FROM
             ta_person t
         INNER JOIN ta_chat h ON h.send_person = t.person_id
@@ -311,7 +312,7 @@
         SELECT
             t.*,
             count(*) as visit_times,
-            max(e.create_date) as visit_time
+            e.create_date as visit_time
         FROM ta_share_person_from e
         INNER JOIN ta_person t ON t.person_id = e.person_id
         WHERE e.org_id = #{orgId}