diff --git a/app/schemas/comprehensive_data.py b/app/schemas/comprehensive_data.py index 367d1e2..32b2452 100644 --- a/app/schemas/comprehensive_data.py +++ b/app/schemas/comprehensive_data.py @@ -19,6 +19,7 @@ class LevelDataImportRequest(BaseModel): NYID: str benchmarkids: Optional[str] = None wsphigh: Optional[str] = None + mtype: Optional[str] = None createDate: Optional[str] = None # 沉降数据导入请求 @@ -115,6 +116,7 @@ class LevelDataQueryRequest(BaseModel): NYID: Optional[str] = None benchmarkids: Optional[str] = None wsphigh: Optional[str] = None + mtype: Optional[str] = None createDate: Optional[str] = None # 批量导入请求 diff --git a/app/services/comprehensive.py b/app/services/comprehensive.py index 0024452..2ec41ba 100644 --- a/app/services/comprehensive.py +++ b/app/services/comprehensive.py @@ -198,6 +198,7 @@ class ComprehensiveDataService: "linecode": level.linecode, "benchmarkids": level.benchmarkids, "wsphigh": level.wsphigh, + "mtype": level.mtype, "NYID": level.NYID, "createDate": level.createDate, "originalDatas": [ diff --git a/app/services/level_data.py b/app/services/level_data.py index bcc320f..f600c9f 100644 --- a/app/services/level_data.py +++ b/app/services/level_data.py @@ -85,6 +85,7 @@ class LevelDataService(BaseService[LevelData]): # 更新操作 level_data.benchmarkids = item_data.get('benchmarkids') level_data.wsphigh = item_data.get('wsphigh') + level_data.mtype = item_data.get('mtype') level_data.createDate = item_data.get('createDate') logger.info(f"Updated level data: {item_data.get('linecode')}-{item_data.get('NYID')}") else: @@ -93,6 +94,7 @@ class LevelDataService(BaseService[LevelData]): linecode=item_data.get('linecode'), benchmarkids=item_data.get('benchmarkids'), wsphigh=item_data.get('wsphigh'), + mtype=item_data.get('mtype'), NYID=item_data.get('NYID'), createDate=item_data.get('createDate') )