From d8be2d693275f42a7c5be45c1b840cab22093c9c Mon Sep 17 00:00:00 2001 From: martsforever Date: Sat, 23 Aug 2025 17:33:06 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=B3=E8=81=94=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=E6=8A=A5=E9=94=80=E5=8D=95=E7=9A=84=E5=85=B6?= =?UTF-8?q?=E4=BB=96=E8=B4=B9=E7=94=A8=E5=AD=90=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/model/ReimburseModel.py | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/app/model/ReimburseModel.py b/app/model/ReimburseModel.py index 47d84b0..142d0ca 100644 --- a/app/model/ReimburseModel.py +++ b/app/model/ReimburseModel.py @@ -6,6 +6,7 @@ from sqlmodel import Field, Relationship, select from app.model.BasicModel import BasicModel from app.model.ProjectModel import ProjectModel +from app.model.ReimburseOtherModel import ReimburseOtherModel from app.model.ReimburseTravelModel import ReimburseTravelModel from app.utils.create_module_service import create_model_service @@ -62,6 +63,24 @@ class ReimburseModel(BasicModel, table=True): def travel_list(self, value: Optional[List["ReimburseTravelModel"]]) -> None: pass + # /*---------------------------------------other_list-------------------------------------------*/ + + other_list_rel: Optional[List["ReimburseOtherModel"]] = Relationship( + sa_relationship_kwargs={ + "foreign_keys": "ReimburseOtherModel.reimburse_id", + "primaryjoin": "ReimburseModel.id == ReimburseOtherModel.reimburse_id", + } + ) + + @computed_field + @property + def other_list(self) -> Optional[List["ReimburseOtherModel"]]: + return self.other_list_rel + + @other_list.setter + def other_list(self, value: Optional[List["ReimburseOtherModel"]]) -> None: + pass + ReimburseService = create_model_service( Cls=ReimburseModel, @@ -70,7 +89,7 @@ ReimburseService = create_model_service( selectinload(ReimburseModel.proj_rel). selectinload(ProjectModel.leader), - # 新增:预加载差旅明细 - selectinload(ReimburseModel.travel_list_rel) + selectinload(ReimburseModel.travel_list_rel), + selectinload(ReimburseModel.other_list_rel), ) )