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

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

@@ -106,7 +106,6 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
 
     @Override
     public IPage<TaPerson> getConsultantShareCustomers(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
-        // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
         return tsConsultantKpiMapper.getConsultantShareCustomers(page, orgId, userId, buildingId, startDate, endDate);
     }
 
@@ -139,13 +138,11 @@ public class TsConsultantKpiServiceImpl extends ServiceImpl<TsConsultantKpiMappe
 
     @Override
     public IPage<TaPerson> getConsultantSharePersons(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate) {
-        // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
         return tsConsultantKpiMapper.getConsultantSharePersons(page, orgId, userId, buildingId, startDate, endDate);
     }
 
     @Override
     public IPage<TaPerson> getConsultantShareTimes(IPage<TaPerson> page, Integer orgId, String userId, String buildingId, LocalDateTime startDate, LocalDateTime endDate, String targetType, String targetName, String userName, String personId) {
-        // buildingId 在表里不一定有数据, 实际执行 SQL 中没有这个条件
         return tsConsultantKpiMapper.getConsultantShareTimes(page, orgId, userId, buildingId, startDate, endDate, targetType, targetName, userName, personId);
     }
 

src/main/resources/mapper/TaUserMapper.xml

@@ -129,7 +129,7 @@
         select building_id from ta_person_building
         where user_id = #{userId}
         <if test="buildingId != null and buildingId != ''">
-            and building_id != #{buildingId}
+            and building_id = #{buildingId}
         </if>
     </select>
 

src/main/resources/mapper/TsConsultantKpiMapper.xml

@@ -164,11 +164,9 @@
             or ( e.target_type = 'share' and e.target_id = 'index' )
         )
         AND e.create_date BETWEEN #{startDate} and #{endDate}
-        <!-- building_id 字段数据不全
         <if test="buildingId != null and buildingId !=''">
             AND e.building_id = #{buildingId}
         </if>
-        -->
         AND e.is_first_time = 1
 
         AND t.phone is not null
@@ -183,7 +181,7 @@
         SELECT
             t.*,
             count( * ) as visit_times,
-            f.visit_time as visit_time
+            max(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
@@ -235,7 +233,7 @@
     <select id="getConsultantChatPersons" resultType="com.huiju.estateagents.entity.TaPerson">
         SELECT
             t.*,
-            h.create_date AS visit_time
+            max(h.create_date) AS visit_time
         FROM
             ta_person t
         INNER JOIN ta_chat h ON h.send_person = t.person_id
@@ -298,7 +296,10 @@
             OR t.tagert_type like 'live%'
             )
         </if>
-        <if test="targetType != null and targetType !=''">
+        <if test="targetType != null and targetType =='card_share'">
+            AND t.tagert_type = 'consultant'
+        </if>
+        <if test="targetType != null and targetType !='' and targetType != 'card_share'">
             AND t.tagert_type like concat(#{targetType}, '%')
         </if>
 
@@ -317,7 +318,7 @@
         SELECT
             t.*,
             count(*) as visit_times,
-            e.create_date as visit_time
+            max(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}
@@ -327,11 +328,11 @@
                 e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
                 OR ( e.target_type = 'share' AND e.target_id = 'index' )
             )
-            <!-- building_id 字段数据不全
-            <if test="buildingId != null and buildingId !=''">
-                AND e.building_id = #{buildingId}
-            </if>
-            -->
+
+        <if test="buildingId != null and buildingId !=''">
+            AND e.building_id = #{buildingId}
+        </if>
+
 <!--            AND t.`status` = 1-->
         GROUP BY t.person_id, DATE_FORMAT(e.create_date, '%Y%m%d')
         ORDER BY e.create_date DESC
@@ -368,11 +369,10 @@
         </if>
 
             AND e.create_date BETWEEN #{startDate} and #{endDate}
-            <!-- building_id 字段数据不全
-            <if test="buildingId != null and buildingId !=''">
-                AND e.building_id = #{buildingId}
-            </if>
-            -->
+
+        <if test="buildingId != null and buildingId !=''">
+            AND e.building_id = #{buildingId}
+        </if>
 
         <if test="personId != null and personId !=''">
             AND t.person_id = #{personId}