huhao/ylt_diy
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复求和数据页面显示的问题

Browse Source
This commit is contained in:
haoslm
2026-07-23 15:17:07 +08:00
parent fa884ae782
commit e37e494a1f
4 changed files with 23 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
lib/sum_data_collector.py
View File

@@ -234,13 +234,13 @@ def _calculate_charge_degree(history):
return None
def get_sum_data_list(page=1, page_size=20, start_date=None, end_date=None, config_id=None,
def get_sum_data_list(page=None, page_size=20, start_date=None, end_date=None, config_id=None,
config_name=None, sum_field_key=None, data_source=None):
"""
查询求和数据列表
Args:
page: 页码
page: 页码（None表示不分页，返回所有数据）
page_size: 每页大小
start_date: 开始日期（可选）
end_date: 结束日期（可选）
@@ -253,8 +253,6 @@ def get_sum_data_list(page=1, page_size=20, start_date=None, end_date=None, conf
dict: 查询结果
"""
try:
offset = (page - 1) * page_size
where_clauses = ['1=1']
params = []
@@ -292,13 +290,23 @@ def get_sum_data_list(page=1, page_size=20, start_date=None, end_date=None, conf
total = total_result[0]['total']
# 查询数据
list_result = execute_query(
f'''SELECT * FROM t_daily_report_sum_data
WHERE {where_sql}
ORDER BY report_date DESC, sort_order ASC, config_id ASC, id DESC
LIMIT %s OFFSET %s''',
tuple(params) + (page_size, offset)
)
if page is not None:
offset = (page - 1) * page_size
list_result = execute_query(
f'''SELECT * FROM t_daily_report_sum_data
WHERE {where_sql}
ORDER BY report_date DESC, sort_order ASC, config_id ASC, id DESC
LIMIT %s OFFSET %s''',
tuple(params) + (page_size, offset)
)
else:
list_result = execute_query(
f'''SELECT * FROM t_daily_report_sum_data
WHERE {where_sql}
ORDER BY report_date DESC, sort_order ASC, config_id ASC, id DESC'''
,
tuple(params)
)
return {
'success': True,