获取原始数据、沉降强制参数account_id

app/services/checkpoint.py

@@ -246,10 +246,12 @@ class CheckpointService(BaseService[Checkpoint]):
 
         if not nyid_list:
             return []
+        print(nyid_list)
 
         max_nyid_str = max(nyid_list, key=int)
         nyid_list = []
         nyid_list.append(max_nyid_str)
+        print(nyid_list)
 
         # 2. 根据NYID列表查询沉降数据表，获取所有point_id（去重）
         point_id_query = db.query(SettlementData.point_id).filter(

app/services/comprehensive.py

@@ -1,5 +1,5 @@
 from sqlalchemy.orm import Session
-from typing import List, Optional, Dict, Any
+from typing import List, Optional, Dict, Any, Union
 from .section_data import SectionDataService
 from .checkpoint import CheckpointService
 from .settlement_data import SettlementDataService
@@ -168,7 +168,7 @@ class ComprehensiveDataService:
         }
 
     def get_level_and_original_data(self, db: Session,
-                                   account_id: Optional[int] = None,
+                                   account_id: Union[int, str],
                                    id: Optional[int] = None,
                                    bfpcode: Optional[str] = None,
                                    bffb: Optional[str] = None,
@@ -186,6 +186,7 @@ class ComprehensiveDataService:
         Returns:
             查询结果字典
         """
+        account_id = int(account_id)  # 强制转换为字符串，确保一致性
         # 查询水准数据
         level_data = self.level_service.search_level_data(
             db,