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-24 15:49:35 +08:00
parent e8ba97bc9d
commit 47e4359eda
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/api/report_api.py
View File

@@ -85,7 +85,7 @@ def get_report_history():
# 查询数据
history = execute_query(
f'SELECT * FROM t_daily_report_history WHERE {where_sql} ORDER BY create_time DESC LIMIT %s OFFSET %s',
f'SELECT *, total_amount AS total_degree FROM t_daily_report_history WHERE {where_sql} ORDER BY create_time DESC LIMIT %s OFFSET %s',
tuple(params) + (page_size, offset)
)

14
lib/report_generator.py
View File

@@ -345,6 +345,10 @@ def generate_daily_report(config_id, start_time=None, end_time=None):
VIRTUAL_FIELDS = {'sharp_electricity', 'peak_electricity', 'flat_electricity', 'valley_electricity', 'custom_service_fee', 'total_amount'}
db_fields = [f for f in selected_fields if f not in VIRTUAL_FIELDS]
# 确保 charge_degree 总是被查询（用于计算总电量）
if 'charge_degree' not in db_fields:
db_fields.append('charge_degree')
# 如果选择了实收金额字段，需要确保查询 charge_elecfee_amount（电费金额）
if 'total_amount' in selected_fields and 'charge_elecfee_amount' not in db_fields:
db_fields.append('charge_elecfee_amount')
@@ -519,8 +523,8 @@ def generate_daily_report(config_id, start_time=None, end_time=None):
log_info(f"[日报生成] Excel文件已生成: {file_path}", 'report')
# 计算总金额
total_amount = sum(float(order.get('total_money', 0) or 0) for order in orders)
# 计算总电量（包括驿来特和特来电所有订单）
total_degree = sum(float(order.get('charge_degree', 0) or 0) for order in orders)
# 保存历史记录
log_info(f"[日报生成] 准备保存历史记录，file_path={file_path}", 'report')
@@ -534,7 +538,7 @@ def generate_daily_report(config_id, start_time=None, end_time=None):
config_id=config_id,
config_name=config.get('config_name', ''),
total_orders=len(orders),
total_amount=total_amount,
total_amount=total_degree,
sum_results=sum_results,
file_path=file_path,
status=1
@@ -555,7 +559,7 @@ def generate_daily_report(config_id, start_time=None, end_time=None):
log_info(f"[日报生成] ✓ 生成成功", 'report')
log_info(f" 订单数量: {len(orders)}", 'report')
log_info(f" 总金额: {total_amount}", 'report')
log_info(f" 总电量: {total_degree} kWh", 'report')
log_info(f" 文件路径: {file_path}", 'report')
log_info(f" 历史记录ID: {history_id}", 'report')
@@ -564,7 +568,7 @@ def generate_daily_report(config_id, start_time=None, end_time=None):
'message': '日报生成成功',
'file_path': file_path,
'total_orders': len(orders),
'total_amount': total_amount,
'total_degree': total_degree,
'sum_results': sum_results,
'history_id': history_id
}