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

断面查询条件加账号id

Browse Source
This commit is contained in:
lhx
2025-10-16 11:43:00 +08:00
parent 1bbef97a69
commit 986789229d
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/api/comprehensive_data.py
View File

@@ -154,7 +154,8 @@ def get_section(request: SectionDataQueryRequest, db: Session = Depends(get_db))
mileage=request.mileage, mileage=request.mileage,
work_site=request.work_site, work_site=request.work_site,
number=request.number, number=request.number,
status=request.status status=request.status,
account_id=request.account_id
) )
logger.info(f"Found {len(result_data)} sections with checkpoints") logger.info(f"Found {len(result_data)} sections with checkpoints")

10
app/services/section_data.py
View File

@@ -32,7 +32,8 @@ class SectionDataService(BaseService[SectionData]):
work_site: Optional[str] = None, work_site: Optional[str] = None,
number: Optional[str] = None, number: Optional[str] = None,
status: Optional[str] = None, status: Optional[str] = None,
basic_types: Optional[str] = None) -> List[SectionData]: basic_types: Optional[str] = None,
account_id: Optional[str] = None) -> List[SectionData]:
"""根据多个条件搜索断面数据""" """根据多个条件搜索断面数据"""
conditions = {} conditions = {}
if section_id is not None: if section_id is not None:
@@ -49,6 +50,8 @@ class SectionDataService(BaseService[SectionData]):
conditions['id'] = id conditions['id'] = id
if mileage is not None: if mileage is not None:
conditions['mileage'] = mileage conditions['mileage'] = mileage
if account_id is not None:
conditions['account_id'] = account_id
return self.search_by_conditions(db, conditions) return self.search_by_conditions(db, conditions)
@@ -58,9 +61,10 @@ class SectionDataService(BaseService[SectionData]):
mileage: Optional[str] = None, mileage: Optional[str] = None,
work_site: Optional[str] = None, work_site: Optional[str] = None,
number: Optional[str] = None, number: Optional[str] = None,
status: Optional[str] = None) -> List[Dict[str, Any]]: status: Optional[str] = None,
account_id: Optional[str] = None) -> List[Dict[str, Any]]:
"""查询断面数据并返回带观测点的结果""" """查询断面数据并返回带观测点的结果"""
sections = self.search_section_data(db, id, section_id, mileage, work_site, number, status) sections = self.search_section_data(db, id, section_id, mileage, work_site, number, status, account_id=account_id)
result = [] result = []
for section in sections: for section in sections: