From 13c1eeac94c509392c21d535f501df45cc204c48 Mon Sep 17 00:00:00 2001 From: wuaho Date: Tue, 24 Aug 2021 10:23:08 +0800 Subject: [PATCH] 1 --- api/api_v1/endpoints/query.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/api/api_v1/endpoints/query.py b/api/api_v1/endpoints/query.py index 7f75e72..c749356 100644 --- a/api/api_v1/endpoints/query.py +++ b/api/api_v1/endpoints/query.py @@ -82,7 +82,7 @@ async def event_model( q['groups'].append(groupby) q['values'].append(df['values'].to_list()) q['sum'].append(int(df['values'].sum())) - q['date_range']=[f'{i[0]}-{i[1]}' for i in df.set_index(['svrindex','name']).index] + q['date_range'] = [f'{i[0]}-{i[1]}' for i in df.set_index(['svrindex', 'name']).index] res.append(q) continue @@ -157,6 +157,7 @@ async def retention_model( df = await ckdb.query_dataframe(sql) concat_data = [] df = pd.concat([df, pd.DataFrame(concat_data, columns=df.columns)]) + df['date'] = df['date'].apply(lambda x: x.date()) # 计算整体 summary_df = df.groupby('date')[['val_a', 'val_b', 'amount_a']].sum() summary_values = {}