浏览代码

报表bug 修复

傅行帆 3 年前
父节点
当前提交
d9781e0973
共有 2 个文件被更改,包括 2492 次插入2520 次删除
  1. 20
    28
      src/main/resources/mapper/TaChannelMapper.xml
  2. 2472
    2492
      src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

+ 20
- 28
src/main/resources/mapper/TaChannelMapper.xml 查看文件

163
         WHERE
163
         WHERE
164
         t.`event` in ( 'detail', 'house_list' , 'poster')
164
         t.`event` in ( 'detail', 'house_list' , 'poster')
165
         AND t.event_type IN (
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
         'live',
169
         'live',
173
-        'house'
170
+        'news',
171
+        'building'
174
         )
172
         )
175
         <if test="targetId != null and targetId != ''">
173
         <if test="targetId != null and targetId != ''">
176
             and t.target_id = #{targetId}
174
             and t.target_id = #{targetId}
225
         WHERE
223
         WHERE
226
         t.`event` in ( 'detail', 'house_list' , 'poster')
224
         t.`event` in ( 'detail', 'house_list' , 'poster')
227
         AND t.event_type IN (
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
         'live',
229
         'live',
235
-        'house'
230
+        'news',
231
+        'building'
236
         )
232
         )
237
         AND t.org_id = #{orgId}
233
         AND t.org_id = #{orgId}
238
         AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
234
         AND DATE_FORMAT(t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
359
         WHERE
355
         WHERE
360
         t.`event` in ( 'detail', 'house_list', 'poster' )
356
         t.`event` in ( 'detail', 'house_list', 'poster' )
361
         AND t.event_type IN (
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
         'live',
361
         'live',
369
-        'house'
362
+        'news',
363
+        'building'
370
         )
364
         )
371
         <if test="targetId != null and targetId != ''">
365
         <if test="targetId != null and targetId != ''">
372
             and t.target_id = #{targetId}
366
             and t.target_id = #{targetId}
421
         WHERE
415
         WHERE
422
         t.`event` in ( 'detail', 'house_list', 'poster' )
416
         t.`event` in ( 'detail', 'house_list', 'poster' )
423
         AND t.event_type IN (
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
         'live',
421
         'live',
431
-        'house'
422
+        'news',
423
+        'building'
432
         )
424
         )
433
         AND t.org_id = #{orgId}
425
         AND t.org_id = #{orgId}
434
         AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
426
         AND DATE_FORMAT( t.visit_time, '%Y-%m-%d' ) >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')

+ 2472
- 2492
src/main/resources/mapper/statistic/TaActivityStaticMapper.xml
文件差异内容过多而无法显示
查看文件