From 36b5104c66ec0bc1b97d552f525bd3bcda615cf9 Mon Sep 17 00:00:00 2001 From: wuaho Date: Fri, 20 Aug 2021 15:39:24 +0800 Subject: [PATCH] 1 --- models/behavior_analysis.py | 1 + models/x_analysis.py | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/models/behavior_analysis.py b/models/behavior_analysis.py index 7fc20a9..f670b90 100644 --- a/models/behavior_analysis.py +++ b/models/behavior_analysis.py @@ -292,6 +292,7 @@ class BehaviorAnalysis: event_name = custom['event_name'] where = [event_name_col.in_(event_name)] event_filter, _ = self.handler_filts(*event['filts']) + select_exprs.extend(self.groupby) qry = sa.select( *select_exprs, custom['select'] diff --git a/models/x_analysis.py b/models/x_analysis.py index 517e5c2..31744cb 100644 --- a/models/x_analysis.py +++ b/models/x_analysis.py @@ -35,7 +35,12 @@ class XAnalysis: report = await crud.report.get(db, id=self.data_in.report_id) self.event_view = report['query']['eventView'] 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['startTime'] = arrow.get().shift(days=-int(s_days)+1).strftime('%Y-%m-%d 00:00:00')