美化表格

lib/api/config_api.py

@@ -42,6 +42,7 @@ def create_config():
         merge_telecom = 1 if data.get('merge_telecom') else 0
         telecom_vehicle_no = data.get('telecom_vehicle_no', '')
         field_custom_names = data.get('field_custom_names', {})
+        show_monthly_total = 1 if data.get('show_monthly_total') else 0
         
         if not config_name or not split_type or not split_value:
             return jsonify({'success': False, 'message': '缺少必填字段'}), 400
@@ -59,8 +60,9 @@ def create_config():
         sql = """
             INSERT INTO t_daily_report_config 
             (id, config_name, split_type, split_value, split_name, selected_fields, 
-             sum_fields, time_periods, merge_telecom, telecom_vehicle_no, field_custom_names, is_active, sort_order, create_time, update_time)
-            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, 1, %s, NOW(), NOW())
+             sum_fields, time_periods, merge_telecom, telecom_vehicle_no, field_custom_names, 
+             show_monthly_total, is_active, sort_order, create_time, update_time)
+            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, 1, %s, NOW(), NOW())
         """
         
         params = (
@@ -75,6 +77,7 @@ def create_config():
             merge_telecom,
             telecom_vehicle_no,
             json.dumps(field_custom_names, ensure_ascii=False) if field_custom_names else None,
+            show_monthly_total,
             sort_order
         )
         
@@ -104,12 +107,14 @@ def update_config(config_id):
         merge_telecom = 1 if data.get('merge_telecom') else 0
         telecom_vehicle_no = data.get('telecom_vehicle_no', '')
         field_custom_names = data.get('field_custom_names', {})
+        show_monthly_total = 1 if data.get('show_monthly_total') else 0
         
         sql = """
             UPDATE t_daily_report_config 
             SET config_name = %s, split_type = %s, split_value = %s, split_name = %s,
                 selected_fields = %s, sum_fields = %s, time_periods = %s,
-                merge_telecom = %s, telecom_vehicle_no = %s, field_custom_names = %s, update_time = NOW()
+                merge_telecom = %s, telecom_vehicle_no = %s, field_custom_names = %s,
+                show_monthly_total = %s, update_time = NOW()
             WHERE id = %s
         """
         
@@ -124,6 +129,7 @@ def update_config(config_id):
             merge_telecom,
             telecom_vehicle_no,
             json.dumps(field_custom_names, ensure_ascii=False) if field_custom_names else None,
+            show_monthly_total,
             config_id
         )
         
@@ -166,8 +172,8 @@ def copy_config(config_id):
         # 插入新配置
         execute_insert(
             '''INSERT INTO t_daily_report_config 
-            (id, config_name, split_type, split_value, split_name, selected_fields, sum_fields, time_periods, merge_telecom, telecom_vehicle_no, field_custom_names, is_active, sort_order, create_time, update_time)
-            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, NOW(), NOW())''',
+            (id, config_name, split_type, split_value, split_name, selected_fields, sum_fields, time_periods, merge_telecom, telecom_vehicle_no, field_custom_names, show_monthly_total, is_active, sort_order, create_time, update_time)
+            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, NOW(), NOW())''',
             (
                 new_id,
                 new_name,
@@ -180,6 +186,7 @@ def copy_config(config_id):
                 original.get('merge_telecom', 0),
                 original.get('telecom_vehicle_no', ''),
                 original.get('field_custom_names', None),
+                original.get('show_monthly_total', 0),
                 original['is_active'],
                 sort_order
             )

lib/api/sum_data_api.py

@@ -8,7 +8,8 @@ from lib.sum_data_collector import (
     add_sum_data,
     update_sum_data,
     delete_sum_data,
-    batch_delete_sum_data
+    batch_delete_sum_data,
+    get_monthly_charge_degree_total
 )
 from . import sum_data_bp
 
@@ -128,3 +129,26 @@ def batch_delete_sum_data_api():
         import traceback
         traceback.print_exc()
         return jsonify({'success': False, 'message': str(e)}), 500
+
+
+@sum_data_bp.route('/sum-data/monthly-total', methods=['GET'])
+def monthly_charge_degree_total():
+    """获取指定配置当月充电电量累计（从sum_data表查询，对账后的数据）
+    
+    参数:
+        config_id: 配置ID（可选，不传则查所有配置总和）
+        month: 月份，格式 YYYY-MM（可选，默认当月）
+    """
+    try:
+        config_id = request.args.get('config_id')
+        month = request.args.get('month')
+        
+        result = get_monthly_charge_degree_total(config_id, month)
+        if result['success']:
+            return jsonify(result)
+        else:
+            return jsonify(result), 400
+    except Exception as e:
+        import traceback
+        traceback.print_exc()
+        return jsonify({'success': False, 'message': str(e)}), 500