leguadmin/xbackend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1

Browse Source
This commit is contained in:
wuaho 2021-08-24 17:52:48 +08:00
parent 5bf8387329
commit 35e479c0fe
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
models/behavior_analysis.py
View File

@ -178,10 +178,8 @@ class BehaviorAnalysis:
event_filter = [] event_filter = []
# filters = (*self.global_filters, *ext_filters) if g_f else (*ext_filters,) # filters = (*self.global_filters, *ext_filters) if g_f else (*ext_filters,)
filters = [] filters = []
if g_f:
filters.extend(self.global_filters)
filters.extend(ext_filters) filters.extend(ext_filters)
else: if g_f:
filters.extend(self.global_filters) filters.extend(self.global_filters)
# filters = [] if filters == ([],) else filters # filters = [] if filters == ([],) else filters
@ -235,10 +233,13 @@ class BehaviorAnalysis:
if visit_name: if visit_name:
who_visit = getattr(self.event_tbl.c, visit_name) who_visit = getattr(self.event_tbl.c, visit_name)
filters, _ = self.handler_filts(*self.events[0].get('filts'), g_f=False)
selectd = [func.toStartOfDay(func.addHours(event_time_col, self.zone_time)).label('date'), selectd = [func.toStartOfDay(func.addHours(event_time_col, self.zone_time)).label('date'),
*self.groupby, *self.groupby,
func.arrayDistinct( func.arrayDistinct(
(func.groupArray(func.if_(event_name_col == event_name_a, who_visit, None)))).label('val_a'), (func.groupArray(
func.if_(func.and_(event_name_col == event_name_a, *filters), who_visit, None)))).label(
'val_a'),
func.length(sa.Column('val_a')).label('amount_a'), func.length(sa.Column('val_a')).label('amount_a'),
func.length(sa.Column('val_b')).label('amount_b'), func.length(sa.Column('val_b')).label('amount_b'),