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

1

Browse Source
This commit is contained in:
wuaho 2021-08-20 15:39:24 +08:00
parent 2348f67621
commit 36b5104c66
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
models/behavior_analysis.py
View File

@ -292,6 +292,7 @@ class BehaviorAnalysis:
event_name = custom['event_name'] event_name = custom['event_name']
where = [event_name_col.in_(event_name)] where = [event_name_col.in_(event_name)]
event_filter, _ = self.handler_filts(*event['filts']) event_filter, _ = self.handler_filts(*event['filts'])
select_exprs.extend(self.groupby)
qry = sa.select( qry = sa.select(
*select_exprs, *select_exprs,
custom['select'] custom['select']

7
models/x_analysis.py
View File

@ -35,7 +35,12 @@ class XAnalysis:
report = await crud.report.get(db, id=self.data_in.report_id) report = await crud.report.get(db, id=self.data_in.report_id)
self.event_view = report['query']['eventView'] self.event_view = report['query']['eventView']
self.events = report['query']['events'] self.events = report['query']['events']
e_days, s_days = self.event_view['recentDay'].split('-') try:
e_days = self.event_view['e_days']
s_days = self.event_view['s_days']
except:
# 兼容以前的
e_days, s_days = self.event_view['recentDay'].split('-')
self.event_view['endTime'] = arrow.get().shift(days=-int(e_days)+1).strftime('%Y-%m-%d 23:59:59') self.event_view['endTime'] = arrow.get().shift(days=-int(e_days)+1).strftime('%Y-%m-%d 23:59:59')
self.event_view['startTime'] = arrow.get().shift(days=-int(s_days)+1).strftime('%Y-%m-%d 00:00:00') self.event_view['startTime'] = arrow.get().shift(days=-int(s_days)+1).strftime('%Y-%m-%d 00:00:00')