feat: 项目的子表审批单信息查不出来

app/model/ApproveModel.py

@@ -1,25 +1,9 @@
-from decimal import Decimal
-from typing import Optional
+from sqlmodel import Field
 
-from pydantic import computed_field
-from sqlalchemy.orm import selectinload
-from sqlmodel import Field, Relationship, select
-
-from app.model.BasicModel import BasicModel
-from app.model.ProjectModel import ProjectModel
+from app.model.PublicApproveModel import PublicApproveModel
 from app.utils.create_module_service import create_model_service
 
 
-class PublicApproveModel(BasicModel):
-  title: str = Field(default=None, description="审批标题")
-  description: str = Field(default=None, description="审批描述信息")
-  status: str = Field(default=None, description="审批状态")
-  amount: Decimal = Field(default=None, description="审批金额")
-  logs: str = Field(default=None, description="审批日志")
-
-  user_id: str = Field(default=None, description="当前审批人id")
-
-
 # 不查询project信息的审批单类
 class ApproveModel(PublicApproveModel, table=True):
   __tablename__ = "pl_approve"
@@ -27,47 +11,4 @@ class ApproveModel(PublicApproveModel, table=True):
 
   proj_id: str = Field(default=None, description="所属项目id")
 
-
 ApproveService = create_model_service(Cls=ApproveModel)
-
-
-# 自动查询project信息的审批单类
-class ApproveProjModel(PublicApproveModel, table=True):
-  __tablename__ = "pl_approve"
-  __table_args__ = {'extend_existing': True}
-
-  # /*---------------------------------------project-------------------------------------------*/
-
-  proj_id: str = Field(
-    default=None,
-    description="所属项目id",
-    foreign_key="pl_project.id",  # 添加外键约束
-    nullable=True
-  )
-
-  proj_rel: Optional["ProjectModel"] = Relationship(
-    sa_relationship_kwargs={
-      "foreign_keys": "ApproveProjModel.proj_id",
-      "remote_side": "ProjectModel.id",
-      "uselist": False
-    }
-  )
-
-  @computed_field
-  @property
-  def project(self) -> Optional[ProjectModel]:
-    return self.proj_rel
-
-  @project.setter
-  def project(self, value: Optional[ProjectModel]) -> None:
-    pass
-
-
-ApproveProjService = create_model_service(
-  Cls=ApproveProjModel,
-  custom_query=lambda: select(ApproveProjModel)
-  .options(
-    selectinload(ApproveProjModel.proj_rel).
-    selectinload(ProjectModel.leader)
-  )
-)