|
@@ -153,13 +153,14 @@
|
153
|
153
|
|
154
|
154
|
<select id="getConsultantShareCustomers" resultType="com.huiju.estateagents.entity.TaPerson">
|
155
|
155
|
SELECT
|
156
|
|
- t.*
|
|
156
|
+ t.*,
|
|
157
|
+ e.create_date as visit_time
|
157
|
158
|
FROM ta_share_person_from e
|
158
|
159
|
INNER JOIN ta_person t ON t.person_id = e.person_id
|
159
|
160
|
WHERE e.org_id = #{orgId}
|
160
|
161
|
AND e.share_person = #{userId}
|
161
|
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
|
164
|
or ( e.target_type = 'share' and e.target_id = 'index' )
|
164
|
165
|
)
|
165
|
166
|
AND e.create_date BETWEEN #{startDate} and #{endDate}
|
|
@@ -292,7 +293,7 @@
|
292
|
293
|
<!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
|
293
|
294
|
<if test="targetType == null or targetType ==''">
|
294
|
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
|
297
|
OR t.tagert_type like 'house%'
|
297
|
298
|
OR t.tagert_type like 'live%'
|
298
|
299
|
)
|
|
@@ -323,7 +324,7 @@
|
323
|
324
|
AND e.share_person = #{userId}
|
324
|
325
|
AND e.create_date BETWEEN #{startDate} and #{endDate}
|
325
|
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
|
328
|
OR ( e.target_type = 'share' AND e.target_id = 'index' )
|
328
|
329
|
)
|
329
|
330
|
<!-- building_id 字段数据不全
|
|
@@ -351,7 +352,7 @@
|
351
|
352
|
<!-- 没有设置 targetType 查询条件, 则只查询固定的几个 -->
|
352
|
353
|
<if test="targetType == null or targetType ==''">
|
353
|
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
|
356
|
OR ( e.target_type = 'share' AND e.target_id = 'index' )
|
356
|
357
|
)
|
357
|
358
|
</if>
|