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

月充总额筛选优化

Browse Source
This commit is contained in:
haoqiyue 2023-03-07 09:49:47 +08:00
parent be599172d6
commit 72fa3d1204
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -246,7 +246,7 @@ async def event_model(
groupby = item['groupby'] # 分组项
date_range = item['date_range'] # 获取的要查询的每一天的时间
df = await ckdb.query_dataframe(sql) # 以sql语句查出数据，df是二维列表
if item['event_name'] == '月充总额': # 充值总额和月充总额是单独拿出来做处理返回数据
if '月充总额' in item['event_name']: # 充值总额和月充总额是单独拿出来做处理返回数据
date_range=df['date'].tolist()
q['date_range']=[str(i).split('-')[0]+'-'+str(i).split('-')[1] for i in date_range]
else:
@ -371,7 +371,7 @@ async def event_model(
for i in set(date_range) - set(df['date']):
concat_data.append((i, 0))
# 纵向拼接两个表
if item['event_name'] != '月充总额':
if '月充总额' not in item['event_name']:
df = pd.concat([df, pd.DataFrame(concat_data, columns=df.columns)])
# 在原数据上按data排序
df.sort_values('date', inplace=True)

4
models/behavior_analysis.py
View File

@ -611,7 +611,7 @@ class BehaviorAnalysis:
qry = sa.select(
custom['select']
).where(*where,*event_filter)
elif event_name_display == '月充总额':
elif '月充总额' in event_name_display:
times = self.start_date.split('-')
start_date = times[0] + '-' + times[1] + '-' + '01 00:00:00'
now = get_time('%Y-%m-%d %H:%M:%S')
@ -725,7 +725,7 @@ class BehaviorAnalysis:
else:
qry = sa.select(selectd).where(and_(*event_filter, *base_where))
if event_name_display == '月充总额':
if '月充总额' in event_name_display:
qry = qry.group_by(event_date_col)
else:
qry = qry.group_by(*select_exprs)