增加account_id条件获取沉降数据

app/services/settlement_data.py

@@ -70,6 +70,100 @@ class SettlementDataService(BaseService[SettlementData]):
 
         return query.all()
 
+    def search_settlement_data_by_point_ids_formatted(self, db: Session,
+                                                      point_ids: List[str],
+                                                      id: Optional[int] = None,
+                                                      nyid: Optional[str] = None,
+                                                      sjName: Optional[str] = None,
+                                                      workinfoname: Optional[str] = None,
+                                                      skip: int = 0,
+                                                      limit: Optional[int] = None) -> Dict[str, Any]:
+        """
+        支持多个point_id的沉降数据批量查询（优化版本）
+        一次性查询，避免多次数据库访问
+        """
+        if not point_ids:
+            return {
+                "data": [],
+                "total": 0,
+                "skip": skip,
+                "limit": limit
+            }
+
+        # 先获取总数（不计分页）
+        count_query = db.query(SettlementData)
+        if id is not None:
+            count_query = count_query.filter(SettlementData.id == id)
+        if nyid is not None:
+            count_query = count_query.filter(SettlementData.NYID == nyid)
+        if sjName is not None:
+            count_query = count_query.filter(SettlementData.sjName == sjName)
+        if workinfoname is not None:
+            count_query = count_query.filter(SettlementData.workinfoname == workinfoname)
+
+        # 支持多个point_id（使用IN查询）
+        count_query = count_query.filter(SettlementData.point_id.in_(point_ids))
+        total_count = count_query.count()
+
+        # 获取分页数据（使用相同的过滤条件）
+        query = db.query(SettlementData)
+        if id is not None:
+            query = query.filter(SettlementData.id == id)
+        if nyid is not None:
+            query = query.filter(SettlementData.NYID == nyid)
+        if sjName is not None:
+            query = query.filter(SettlementData.sjName == sjName)
+        if workinfoname is not None:
+            query = query.filter(SettlementData.workinfoname == workinfoname)
+
+        # 支持多个point_id
+        query = query.filter(SettlementData.point_id.in_(point_ids))
+
+        # 按上传时间倒序排序
+        query = query.order_by(SettlementData.createdate.desc())
+
+        # 添加分页支持
+        if skip > 0:
+            query = query.offset(skip)
+        if limit is not None and limit > 0:
+            query = query.limit(limit)
+
+        settlement_data = query.all()
+
+        # 格式化结果
+        result = []
+        for settlement in settlement_data:
+            settlement_dict = {
+                "id": settlement.id,
+                "point_id": settlement.point_id,
+                "CVALUE": settlement.CVALUE,
+                "MAVALUE": settlement.MAVALUE,
+                "MTIME_W": settlement.MTIME_W,
+                "NYID": settlement.NYID,
+                "PRELOADH": settlement.PRELOADH,
+                "PSTATE": settlement.PSTATE,
+                "REMARK": settlement.REMARK,
+                "WORKINFO": settlement.WORKINFO,
+                "createdate": settlement.createdate,
+                "day": settlement.day,
+                "day_jg": settlement.day_jg,
+                "isgzjdxz": settlement.isgzjdxz,
+                "mavalue_bc": settlement.mavalue_bc,
+                "mavalue_lj": settlement.mavalue_lj,
+                "sjName": settlement.sjName,
+                "useflag": settlement.useflag,
+                "workinfoname": settlement.workinfoname,
+                "upd_remark": settlement.upd_remark
+            }
+            result.append(settlement_dict)
+
+        return {
+            "data": result,
+            "total": total_count,
+            "skip": skip,
+            "limit": limit
+        }
+
     def search_settlement_data_formatted(self, db: Session,
                                         id: Optional[int] = None,
                                         point_id: Optional[str] = None,