From 03098a553ef700c665ba0d9f97526d7ae103c1b7 Mon Sep 17 00:00:00 2001
From: haoslm <6083297@qq.com>
Date: Wed, 22 Jul 2026 10:18:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E6=88=90=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E4=B8=AD=EF=BC=8C=E7=89=B9=E6=9D=A5=E7=94=B5=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89vin=E5=92=8C=E8=BD=A6=E5=8F=B7=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=A2=9E=E5=8A=A0=E6=97=A5=E5=BF=97=EF=BC=8C?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=B8=BA=E4=BB=80=E4=B9=88=E5=AE=9A=E6=97=B6?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=90=88=E5=B9=B6=E4=B8=8D=E4=BA=86=E7=89=B9?=
 =?UTF-8?q?=E6=9D=A5=E7=94=B5=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/report_generator.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/report_generator.py b/lib/report_generator.py
index 9df88a3..083992f 100644
--- a/lib/report_generator.py
+++ b/lib/report_generator.py
@@ -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()]