修改生成报表中,特来电没有vin和车号的问题,增加日志,查看为什么定时任务合并不了特来电报表
This commit is contained in:
@@ -45,6 +45,10 @@ TELECOM_FIELD_MAPPING = {
|
||||
'flat_power': 'flat_electricity', # 平时段电量
|
||||
'valley_power': 'valley_electricity', # 谷时段电量
|
||||
'vehicle_self_no': 'company_name', # 车量自编号 → 企业名称
|
||||
'plate_no': 'charge_plate_no', # 车牌号
|
||||
'vin_code': 'charge_vin', # VIN码
|
||||
'stop_reason': 'finish_msg', # 结束原因
|
||||
'charge_duration_sec': 'charge_duration', # 充电时长(秒)
|
||||
}
|
||||
|
||||
# 特来电数据中名称字段到ID字段的映射(用于匹配selected_fields中的ID字段)
|
||||
@@ -80,6 +84,7 @@ def query_telecom_orders(vehicle_self_nos, start_time_str, end_time_str):
|
||||
connector_name,
|
||||
charge_start_time,
|
||||
charge_end_time,
|
||||
charge_duration_sec,
|
||||
total_power,
|
||||
start_soc,
|
||||
end_soc,
|
||||
@@ -90,7 +95,10 @@ def query_telecom_orders(vehicle_self_nos, start_time_str, end_time_str):
|
||||
peak_power,
|
||||
flat_power,
|
||||
valley_power,
|
||||
vehicle_self_no
|
||||
vehicle_self_no,
|
||||
plate_no,
|
||||
vin_code,
|
||||
stop_reason
|
||||
FROM t_hlht_tld
|
||||
WHERE vehicle_self_no IN ({placeholders})
|
||||
AND second_source != '驿来特'
|
||||
@@ -392,6 +400,8 @@ def generate_daily_report(config_id, start_time=None, end_time=None):
|
||||
merge_telecom = config.get('merge_telecom') or 0
|
||||
telecom_vehicle_no = config.get('telecom_vehicle_no') or ''
|
||||
|
||||
log_info(f"[日报生成] 特来电合并配置: merge_telecom={merge_telecom}, split_type={config['split_type']}, vehicle_no={telecom_vehicle_no}", 'report')
|
||||
|
||||
if merge_telecom and config['split_type'] == 'company_id' and telecom_vehicle_no:
|
||||
# 解析车量自编号(支持逗号分隔的多个)
|
||||
vehicle_nos = [v.strip() for v in telecom_vehicle_no.split(',') if v.strip()]
|
||||
|
||||
Reference in New Issue
Block a user