续约待办历史记录迁移

back_ground_module/revisit_renew_services_90_120_180.py

@@ -326,16 +326,29 @@ class RenewServicesRevisit:
             # 将最佳值合并回原数据集
             data_NGV = data_NGV.merge(best_values, on='id_own_group', how='left')
 
-            condition = (data_NGV['is_main_org'] == 1) & (data_NGV['org_status'] == '过期')  # 步骤2: 过滤条件
+            # 修复：处理 is_main_org 可能是字符串类型的情况
+            if data_NGV['is_main_org'].dtype == 'object':
+                is_main_org_numeric = pd.to_numeric(data_NGV['is_main_org'], errors='coerce')
+                condition = (is_main_org_numeric == 1) & (data_NGV['org_status'] == '过期')  # 步骤2: 过滤条件
+            else:
+                condition = (data_NGV['is_main_org'] == 1) & (data_NGV['org_status'] == '过期')  # 步骤2: 过滤条件
 
             ngvv2 = data_NGV[condition]
             # ngvv2.to_excel(r"C:\Users\Administrator.DESKTOP-7IC2USJ\Desktop\NGVV2.xlsx")
 
             data_NGV_V2 = data_NGV.copy()  # 步骤3: 检查id_own_group是否存在于ngvv2中
-            data_NGV_V2['条件'] = ((data_NGV_V2['org_type'] == "一般") & (data_NGV_V2['org_status'] == '留存') &
+            # 修复：处理 is_main_org 可能是字符串类型的情况
-                                   (data_NGV_V2['area_manager'] != '殷昊') & (
+            if data_NGV_V2['is_main_org'].dtype == 'object':
-                                           data_NGV_V2['area_manager'] != '孙玉蕾') & (
+                is_main_org_numeric_v2 = pd.to_numeric(data_NGV_V2['is_main_org'], errors='coerce')
-                                           data_NGV_V2['is_main_org'] != 1))
+                data_NGV_V2['条件'] = ((data_NGV_V2['org_type'] == "一般") & (data_NGV_V2['org_status'] == '留存') &
+                                       (data_NGV_V2['area_manager'] != '殷昊') & (
+                                               data_NGV_V2['area_manager'] != '孙玉蕾') & (
+                                               is_main_org_numeric_v2 != 1))
+            else:
+                data_NGV_V2['条件'] = ((data_NGV_V2['org_type'] == "一般") & (data_NGV_V2['org_status'] == '留存') &
+                                       (data_NGV_V2['area_manager'] != '殷昊') & (
+                                               data_NGV_V2['area_manager'] != '孙玉蕾') & (
+                                               data_NGV_V2['is_main_org'] != 1))
             data_NGV_V2 = data_NGV_V2.loc[data_NGV_V2["条件"]]
             # 步骤4: 过滤存在的记录
             data_NGV_V2['exists_in_ngvv2'] = data_NGV_V2['id_own_group'].isin(ngvv2['id_own_group'])
@@ -350,10 +363,18 @@ class RenewServicesRevisit:
 
             result = filtered_data.drop_duplicates(subset='id_own_group', keep='first')
 
-            data_NGV['条件'] = (data_NGV['org_type'] == "一般") & (data_NGV['org_status'] == '留存') & (
+            # 修复：处理 is_main_org 可能是字符串类型的情况
-                    data_NGV['area_manager'] != '殷昊') & (
+            if data_NGV['is_main_org'].dtype == 'object':
-                                       data_NGV['area_manager'] != '孙玉蕾') & (
+                is_main_org_numeric_main = pd.to_numeric(data_NGV['is_main_org'], errors='coerce')
-                                       data_NGV['is_main_org'] == 1)
+                data_NGV['条件'] = (data_NGV['org_type'] == "一般") & (data_NGV['org_status'] == '留存') & (
+                        data_NGV['area_manager'] != '殷昊') & (
+                                           data_NGV['area_manager'] != '孙玉蕾') & (
+                                           is_main_org_numeric_main == 1)
+            else:
+                data_NGV['条件'] = (data_NGV['org_type'] == "一般") & (data_NGV['org_status'] == '留存') & (
+                        data_NGV['area_manager'] != '殷昊') & (
+                                           data_NGV['area_manager'] != '孙玉蕾') & (
+                                           data_NGV['is_main_org'] == 1)
             data_NGV = data_NGV.loc[data_NGV["条件"]]
 
             data_NGV = pd.concat([data_NGV, result], axis=0)

test/logs/task.log

@@ -61144,3 +61144,23 @@
 2026-01-16 15:27:09,831 - 1383378715.py - task_logger - INFO - 过滤公司条数:19
 2026-01-16 15:39:29,215 - 1346048822.py - task_logger - INFO - 过滤后的数据长度为: 31272
 2026-01-16 17:14:24,070 - 399365335.py - task_logger - WARNING - 请求异常: ('Connection aborted.', ConnectionResetError(10054, '远程主机强迫关闭了一个现有的连接。', None, 10054, None)), 将重新请求
+2026-01-17 10:30:23,881 - api.py - task_logger - INFO - 获取了3671条数据
+2026-01-17 10:30:30,916 - api.py - task_logger - INFO - 获取了152条数据
+2026-01-17 10:30:33,324 - api.py - task_logger - INFO - 获取了192条数据
+2026-01-17 10:36:36,858 - api.py - task_logger - WARNING - 请求异常: HTTPSConnectionPool(host='api.jiandaoyun.com', port=443): Read timed out. (read timeout=10), 将重新请求
+2026-01-17 10:37:06,900 - api.py - task_logger - WARNING - 请求异常: ('Connection aborted.', ConnectionResetError(10054, '远程主机强迫关闭了一个现有的连接。', None, 10054, None)), 将重新请求
+2026-01-17 10:37:50,208 - api.py - task_logger - WARNING - 请求异常: HTTPSConnectionPool(host='api.jiandaoyun.com', port=443): Read timed out. (read timeout=10), 将重新请求
+2026-01-17 10:39:12,631 - api.py - task_logger - WARNING - 请求异常: HTTPSConnectionPool(host='api.jiandaoyun.com', port=443): Read timed out. (read timeout=10), 将重新请求
+2026-01-17 10:44:04,035 - api.py - task_logger - INFO - 获取了45261条数据
+2026-01-17 10:48:09,551 - api.py - task_logger - INFO - 获取了21042条数据
+2026-01-17 10:53:20,504 - api.py - task_logger - INFO - 获取了26187条数据
+2026-01-17 10:58:41,890 - api.py - task_logger - WARNING - 请求异常: HTTPSConnectionPool(host='api.jiandaoyun.com', port=443): Read timed out. (read timeout=10), 将重新请求
+2026-01-17 11:01:45,555 - api.py - task_logger - WARNING - 请求异常: HTTPSConnectionPool(host='api.jiandaoyun.com', port=443): Read timed out. (read timeout=10), 将重新请求
+2026-01-17 11:19:19,476 - api.py - task_logger - INFO - 获取了127007条数据
+2026-01-17 11:19:34,022 - api.py - task_logger - INFO - 获取了458条数据
+2026-01-17 11:19:58,121 - api.py - task_logger - INFO - 获取了3199条数据
+2026-01-17 11:20:04,018 - api.py - task_logger - INFO - 获取了686条数据
+2026-01-17 11:20:04,924 - api.py - task_logger - INFO - 获取了68条数据
+2026-01-17 11:23:12,334 - api.py - task_logger - WARNING - 请求异常: HTTPSConnectionPool(host='api.jiandaoyun.com', port=443): Read timed out. (read timeout=10), 将重新请求
+2026-01-17 11:24:13,420 - api.py - task_logger - INFO - 获取了20834条数据
+2026-01-17 11:24:22,821 - api.py - task_logger - INFO - 获取了2条数据