数据查询，账号字段增加

app/services/comprehensive.py

@@ -167,8 +167,64 @@ class ComprehensiveDataService:
             }
         }
 
+    def get_level_and_original_data(self, db: Session,
+                                   id: Optional[int] = None,
+                                   bfpcode: Optional[str] = None,
+                                   bffb: Optional[str] = None,
+                                   nyid: Optional[str] = None,
+                                   linecode: Optional[str] = None,
+                                   bfpl: Optional[str] = None) -> Dict[str, Any]:
+        """根据条件获取水准数据+原始数据的组合查询"""
+        # 查询水准数据
+        level_data = self.level_service.search_level_data(
+            db,
+            nyid=nyid,
+            linecode=linecode
+        )
+
+        # 查询原始数据
+        original_data = self.original_service.search_original_data(
+            db,
+            bfpcode=bfpcode,
+            bffb=bffb,
+            nyid=nyid,
+            bfpl=bfpl
+        )
+        result = []
+        original_count = 0
+        for level in level_data:
+            data = {
+                    "id": level.id,
+                    "linecode": level.linecode,
+                    "benchmarkids": level.benchmarkids,
+                    "wsphigh": level.wsphigh,
+                    "NYID": level.NYID,
+                    "createDate": level.createDate,
+                    "originalDatas": [
+                        {
+                            "id": orig.id,
+                            "bfpcode": orig.bfpcode,
+                            "mtime": orig.mtime,
+                            "bffb": orig.bffb,
+                            "bfpl": orig.bfpl,
+                            "bfpvalue": orig.bfpvalue,
+                            "times": orig.times,
+                            "NYID": orig.NYID,
+                            "sort": orig.sort
+                        } for orig in original_data if orig.NYID == level.NYID
+                    ]
+                }
+            original_count += len(data["originalDatas"])
+            result.append(data)
+
+        return {
+            "success": True,
+            "message": "查询成功",
+            "count": original_count,
+            "data": result
+        }
+
     def get_statistics_summary(self, db: Session) -> Dict[str, Any]:
-        """获取全局统计摘要"""
         all_sections = self.section_service.get_all(db, limit=10000)
         all_checkpoints = self.checkpoint_service.get_all(db, limit=10000)
         all_settlement = self.settlement_service.get_all(db, limit=10000)