张延森 5 years ago
parent
commit
f09a232c7c

+ 1
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml View File

831
     </select>
831
     </select>
832
 
832
 
833
     <select id="getCustomerListOfConsultant" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
833
     <select id="getCustomerListOfConsultant" resultType="com.huiju.estateagents.entity.TaRecommendCustomer">
834
-        select s.*, t.avatarurl
834
+        select s.*, t.avatarurl, s.report_date as visit_time
835
         from ta_recommend_customer s
835
         from ta_recommend_customer s
836
         left join ta_person t on t.person_id = s.person_id
836
         left join ta_person t on t.person_id = s.person_id
837
         where s.org_id = #{orgId}
837
         where s.org_id = #{orgId}

+ 6
- 5
src/main/resources/mapper/TsConsultantKpiMapper.xml View File

153
 
153
 
154
     <select id="getConsultantShareCustomers" resultType="com.huiju.estateagents.entity.TaPerson">
154
     <select id="getConsultantShareCustomers" resultType="com.huiju.estateagents.entity.TaPerson">
155
         SELECT
155
         SELECT
156
-        t.*
156
+            t.*,
157
+            e.create_date as visit_time
157
         FROM ta_share_person_from e
158
         FROM ta_share_person_from e
158
         INNER JOIN ta_person t ON t.person_id = e.person_id
159
         INNER JOIN ta_person t ON t.person_id = e.person_id
159
         WHERE e.org_id = #{orgId}
160
         WHERE e.org_id = #{orgId}
160
         AND e.share_person = #{userId}
161
         AND e.share_person = #{userId}
161
         AND (
162
         AND (
162
-            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
163
+            e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
163
             or ( e.target_type = 'share' and e.target_id = 'index' )
164
             or ( e.target_type = 'share' and e.target_id = 'index' )
164
         )
165
         )
165
         AND e.create_date BETWEEN #{startDate} and #{endDate}
166
         AND e.create_date BETWEEN #{startDate} and #{endDate}
292
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
293
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
293
         <if test="targetType == null or targetType ==''">
294
         <if test="targetType == null or targetType ==''">
294
             AND (
295
             AND (
295
-            t.tagert_type IN ( 'project', 'activity', 'group', 'h5', 'help', 'news', 'main' )
296
+            t.tagert_type IN ( 'consultant', 'project', 'activity', 'group', 'h5', 'help', 'news', 'main' )
296
             OR t.tagert_type like 'house%'
297
             OR t.tagert_type like 'house%'
297
             OR t.tagert_type like 'live%'
298
             OR t.tagert_type like 'live%'
298
             )
299
             )
323
             AND e.share_person = #{userId}
324
             AND e.share_person = #{userId}
324
             AND e.create_date BETWEEN #{startDate} and #{endDate}
325
             AND e.create_date BETWEEN #{startDate} and #{endDate}
325
             AND (
326
             AND (
326
-                e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
327
+                e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
327
                 OR ( e.target_type = 'share' AND e.target_id = 'index' )
328
                 OR ( e.target_type = 'share' AND e.target_id = 'index' )
328
             )
329
             )
329
             <!-- building_id 字段数据不全
330
             <!-- building_id 字段数据不全
351
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
352
         <!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
352
         <if test="targetType == null or targetType ==''">
353
         <if test="targetType == null or targetType ==''">
353
             AND (
354
             AND (
354
-            e.target_type IN ( 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
355
+            e.target_type IN ( 'card_share', 'building_share', 'dynamic_share', 'group_share', 'h5_share', 'help_share', 'house_share', 'live_share', 'news_share', 'poster' )
355
             OR ( e.target_type = 'share' AND e.target_id = 'index' )
356
             OR ( e.target_type = 'share' AND e.target_id = 'index' )
356
             )
357
             )
357
         </if>
358
         </if>