admin/railway_cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

取消沉降account_id参数

Browse Source
This commit is contained in:
lhx
2025-11-29 16:32:17 +08:00
parent 88de975af6
commit 5174fd82b8
2 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/api/comprehensive_data.py
View File

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

2
app/schemas/comprehensive_data.py
View File

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