From 04746300eba781c494cb2cd7c3b1b904e246d311 Mon Sep 17 00:00:00 2001
From: whm <973418690@qq.com>
Date: Thu, 30 Oct 2025 15:07:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=86=B5=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/services/settlement_data.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/app/services/settlement_data.py b/app/services/settlement_data.py
index 8dce92d..19e009e 100644
--- a/app/services/settlement_data.py
+++ b/app/services/settlement_data.py
@@ -383,10 +383,11 @@ class SettlementDataService(BaseService[SettlementData]):
             
             target_nyids = [item.NYID for item in top_nyids]
             
-            # 2. 关联查询：沉降数据 → 观测点表 → 断面表（使用模型类名，而非表名）
+            # 2. 关联查询：沉降数据 → 观测点表 → 断面表（新增查询Checkpoint.aname）
             settlement_records = db.query(
                 SettlementData,
                 Checkpoint.section_id,  # 从Checkpoint模型获取section_id
+                Checkpoint.aname,       # 新增：从Checkpoint模型获取测点名称aname
                 SectionData.work_site   # 从SectionData模型获取work_site
             )\
             .join(
@@ -406,11 +407,11 @@ class SettlementDataService(BaseService[SettlementData]):
             )\
             .all()
             
-            # 3. 转换数据并新增work_type字段
+            # 3. 转换数据并新增字段
             settlement_data = []
             for record in settlement_records:
-                # 解析查询结果（元组：(沉降数据实例, section_id, work_site)）
-                settlement, section_id, work_site = record
+                # 解析查询结果（元组：(沉降数据实例, section_id, aname, work_site)）
+                settlement, section_id, aname, work_site = record
                 
                 # 根据work_site判断work_type（默认0表示未匹配或无数据）
                 work_type = 0
@@ -423,13 +424,14 @@ class SettlementDataService(BaseService[SettlementData]):
                     elif "桥" in work_site_str:
                         work_type = 3
                 
-                # 组装返回字典（包含新增字段）
+                # 组装返回字典（新增aname字段）
                 record_dict = {
                     "id": settlement.id,
                     "point_id": settlement.point_id,
-                    "section_id": section_id,  # 新增：观测点关联的断面ID
-                    "work_site": work_site,    # 新增：断面的工点信息
-                    "work_type": work_type,    # 新增：工点类型编码（1-隧道，2-区间路基，3-桥）
+                    "aname": aname,           # 新增：测点名称（从Checkpoint表获取）
+                    "section_id": section_id, # 新增：观测点关联的断面ID
+                    "work_site": work_site,   # 新增：断面的工点信息
+                    "work_type": work_type,   # 新增：工点类型编码（1-隧道，2-区间路基，3-桥）
                     "CVALUE": settlement.CVALUE,
                     "MAVALUE": settlement.MAVALUE,
                     "MTIME_W": settlement.MTIME_W.strftime("%Y-%m-%d %H:%M:%S") if settlement.MTIME_W else None,