取消沉降account_id参数

app/api/comprehensive_data.py

@@ -353,26 +353,26 @@ def get_settlement(request: SettlementDataQueryRequest, db: Session = Depends(ge
             logger.info(f"Found {result['total']} settlement records using optimized batch query, returning {len(result['data'])} records")
 
         else:
-            return DataResponse(
-                code=ResponseCode.SUCCESS,
-                message="未提供account_id，请提供account_id",
-                total=0,
-                data=[]
-            )
+            # return DataResponse(
+            #     code=ResponseCode.SUCCESS,
+            #     message="未提供account_id，请提供account_id",
+            #     total=0,
+            #     data=[]
+            # )
             # 强制 account_id 查询
             # 原逻辑：不提供account_id，按原有方式查询
-            # logger.info("Using original query logic without account_id")
-            # result = settlement_service.search_settlement_data_formatted(
-            #     db,
-            #     id=request.id,
-            #     point_id=request.point_id,
-            #     nyid=request.NYID,
-            #     sjName=request.sjName,
-            #     workinfoname=request.workinfoname,
-            #     skip=request.skip,
-            #     limit=request.limit
-            # )
-            # logger.info(f"Found {result['total']} settlement records using original logic, returning {len(result['data'])} records")
+            logger.info("Using original query logic without account_id")
+            result = settlement_service.search_settlement_data_formatted(
+                db,
+                id=request.id,
+                point_id=request.point_id,
+                nyid=request.NYID,
+                sjName=request.sjName,
+                workinfoname=request.workinfoname,
+                skip=request.skip,
+                limit=request.limit
+            )
+            logger.info(f"Found {result['total']} settlement records using original logic, returning {len(result['data'])} records")
 
         return DataResponse(
             code=ResponseCode.SUCCESS,

app/schemas/comprehensive_data.py

@@ -103,7 +103,7 @@ class SettlementDataQueryRequest(BaseModel):
     id: Optional[int] = None
     point_id: Optional[int] = None
     NYID: Optional[int] = None
-    account_id: str  # 账号ID，强制要求
+    account_id: Optional[str] = None  # 账号ID，可选，兼容int和str
     CVALUE: Optional[str] = None
     MAVALUE: Optional[str] = None
     MTIME_W: Optional[str] = None