Merge branch 'main' of http://119.6.225.4:3000/lhx/project

app/services/checkpoint.py

@@ -254,10 +254,14 @@ class CheckpointService(BaseService[Checkpoint]):
         print(nyid_list)
 
         # 2. 根据NYID列表查询沉降数据表，获取所有point_id（去重）
-        point_id_query = db.query(SettlementData.point_id).filter(
+        point_id_query = db.query(
+            SettlementData.point_id
+        ).filter(
             SettlementData.NYID.in_(nyid_list)
         ).distinct()
 
-        point_id_list = [result.point_id for result in point_id_query.all() if result.point_id]
+        point_id_list = [f'{result.point_id}' for result in point_id_query.all() if result.point_id]
+        # -{db.query(Checkpoint.aname).filter(Checkpoint.point_id == result.point_id).first().aname}
+        point_id_dict = {item :db.query(Checkpoint.aname).filter(Checkpoint.point_id == item).first().aname for item in point_id_list}
 
-        return point_id_list
+        return point_id_list,point_id_dict