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

分组不存在

Browse Source
This commit is contained in:
wuaho 2021-09-22 10:15:12 +08:00
parent 7d7a3801c3
commit 5a6bd4ea02
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/api_v1/endpoints/query.py
View File

@ -183,7 +183,7 @@ async def event_model(
if last_value > 0: if last_value > 0:
q['last_value'] = float(last_value) q['last_value'] = float(last_value)
break break
if groupby: if groupby and (set(groupby) & set(df) == set(groupby)):
q['date_range'] = [f'{i}' for i in df.set_index(groupby).index] q['date_range'] = [f'{i}' for i in df.set_index(groupby).index]
else: else:
q['date_range'] = ['合计'] q['date_range'] = ['合计']
@ -191,7 +191,7 @@ async def event_model(
res.append(q) res.append(q)
continue continue
if groupby: if groupby and (set(groupby) & set(df)) == set(groupby):
# 有分组 # 有分组
for group, df_group in df.groupby(groupby): for group, df_group in df.groupby(groupby):
df_group.reset_index(drop=True, inplace=True) df_group.reset_index(drop=True, inplace=True)
@ -293,7 +293,7 @@ async def retention_model(request: Request,
for i in set(date_range) - set(df.index): for i in set(date_range) - set(df.index):
df.loc[i] = 0 df.loc[i] = 0
df.sort_index(inplace=True) df.sort_index(inplace=True)
days = [i for i in range(1,unit_num + 1)] days = [i for i in range(1, unit_num + 1)]
summary_values = {} summary_values = {}
today = datetime.datetime.today().date() today = datetime.datetime.today().date()