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

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -24,7 +24,11 @@
                 IFNULL(sum( t.chat_persons ),0) AS chat_persons,
                 IFNULL(sum( t.favor_num ),0) AS favor_num,
                 (select count(DISTINCT s.customer_id) from ta_recommend_customer s
-                 where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id) and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '') and s.status > 0) as total_persons
+                 where s.org_id = t.org_id and (s.realty_consultant = t.user_id or s.realty_consultant = m.person_id)
+                 and (s.building_id = t.building_id or IFNULL(t.building_id, '') = '')
+                 and s.status > 0
+                 AND s.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d' )
+                 AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')) as total_persons
             FROM
                 ts_consultant_kpi t
             LEFT JOIN ta_person m on m.org_id = #{orgId} and m.user_id = t.user_id
@@ -141,7 +145,8 @@
         WHERE
             p.org_id = #{orgId}
             AND p.`status` > 0
-            AND t.statis_date BETWEEN #{startDate} AND #{endDate}
+            AND p.create_date BETWEEN STR_TO_DATE( #{startDate}, '%Y%m%d')
+            AND  STR_TO_DATE(concat(#{endDate}, '235959'), '%Y%m%d%H%i%s')
         <if test="buildingIds != null">
             AND t.building_id in
             <foreach item="buildingId" index="index" collection="buildingIds"