|
@@ -163,14 +163,12 @@
|
163
|
163
|
WHERE
|
164
|
164
|
t.`event` in ( 'detail', 'house_list' , 'poster')
|
165
|
165
|
AND t.event_type IN (
|
166
|
|
- 'activity',
|
167
|
|
- 'help',
|
168
|
|
- 'group',
|
169
|
|
- 'h5',
|
170
|
|
- 'news',
|
171
|
|
- 'building',
|
|
166
|
+ 'dymic',
|
|
167
|
+ 'house',
|
|
168
|
+ 'look',
|
172
|
169
|
'live',
|
173
|
|
- 'house'
|
|
170
|
+ 'news',
|
|
171
|
+ 'building'
|
174
|
172
|
)
|
175
|
173
|
<if test="targetId != null and targetId != ''">
|
176
|
174
|
and t.target_id = #{targetId}
|
|
@@ -225,14 +223,12 @@
|
225
|
223
|
WHERE
|
226
|
224
|
t.`event` in ( 'detail', 'house_list' , 'poster')
|
227
|
225
|
AND t.event_type IN (
|
228
|
|
- 'activity',
|
229
|
|
- 'help',
|
230
|
|
- 'group',
|
231
|
|
- 'h5',
|
232
|
|
- 'news',
|
233
|
|
- 'building',
|
|
226
|
+ 'dymic',
|
|
227
|
+ 'house',
|
|
228
|
+ 'look',
|
234
|
229
|
'live',
|
235
|
|
- 'house'
|
|
230
|
+ 'news',
|
|
231
|
+ 'building'
|
236
|
232
|
)
|
237
|
233
|
AND t.org_id = #{orgId}
|
238
|
234
|
AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
|
|
@@ -359,14 +355,12 @@
|
359
|
355
|
WHERE
|
360
|
356
|
t.`event` in ( 'detail', 'house_list', 'poster' )
|
361
|
357
|
AND t.event_type IN (
|
362
|
|
- 'activity',
|
363
|
|
- 'help',
|
364
|
|
- 'group',
|
365
|
|
- 'h5',
|
366
|
|
- 'news',
|
367
|
|
- 'building',
|
|
358
|
+ 'dymic',
|
|
359
|
+ 'house',
|
|
360
|
+ 'look',
|
368
|
361
|
'live',
|
369
|
|
- 'house'
|
|
362
|
+ 'news',
|
|
363
|
+ 'building'
|
370
|
364
|
)
|
371
|
365
|
<if test="targetId != null and targetId != ''">
|
372
|
366
|
and t.target_id = #{targetId}
|
|
@@ -421,14 +415,12 @@
|
421
|
415
|
WHERE
|
422
|
416
|
t.`event` in ( 'detail', 'house_list', 'poster' )
|
423
|
417
|
AND t.event_type IN (
|
424
|
|
- 'activity',
|
425
|
|
- 'help',
|
426
|
|
- 'group',
|
427
|
|
- 'h5',
|
428
|
|
- 'news',
|
429
|
|
- 'building',
|
|
418
|
+ 'dymic',
|
|
419
|
+ 'house',
|
|
420
|
+ 'look',
|
430
|
421
|
'live',
|
431
|
|
- 'house'
|
|
422
|
+ 'news',
|
|
423
|
+ 'building'
|
432
|
424
|
)
|
433
|
425
|
AND t.org_id = #{orgId}
|
434
|
426
|
AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
|