diff --git a/app/cross_compare_report.py b/app/cross_compare_report.py index 371c5ca..ab7065b 100644 --- a/app/cross_compare_report.py +++ b/app/cross_compare_report.py @@ -279,7 +279,7 @@ def gen_compare_report_part1_data(data_range, compare_date_range, time_range, cr service_level_compare_str = f"{index_dict[key]}由{final_overview[compare_key]}提升为{final_overview[key]}, 提升{service_level_compare_res}个等级;" part1_data['data_list'].append(service_level_compare_str) elif key in ('jam_index', 'stop_times', 'high_park_percent', 'delay_time'): - if key == 'high_park_percent': + if key == 'high_park_percent' and final_overview[key] != '-' and final_overview[compare_key] != '-': final_overview[key] = int(final_overview[key].replace('%', '')) final_overview[compare_key] = int(final_overview[compare_key].replace('%', '')) if final_overview[compare_key] and final_overview[key] and final_overview[key] != '-' and final_overview[compare_key] != '-' and final_overview[compare_key] > final_overview[key]: @@ -471,7 +471,7 @@ def gen_compare_report_part5_data(part1_data, compared_inroad_delay_infos): service_level_compare_str = f"{index_dict[key]}由{compare_data[key]}提升为{item_data[key]}, 提升{service_level_compare_res}个等级;" src_dir_data.append(service_level_compare_str) elif key in ('stop_times', 'high_park_percent', 'delay_time'): - if key == 'high_park_percent': + if key == 'high_park_percent' and compare_data[key] != '-' and item_data[key] != '-': item_data[key] = int(item_data[key].replace('%', '')) compare_data[key] = int(compare_data[key].replace('%', '')) if compare_data[key] and item_data[key] and compare_data[key] != '-' and item_data[key] != '-' and compare_data[key] > item_data[key]: