feat: remove approve model
This commit is contained in:
@@ -1,14 +0,0 @@
|
||||
from sqlmodel import Field
|
||||
|
||||
from app.model.PublicApproveModel import PublicApproveModel
|
||||
from app.utils.create_module_service import create_model_service
|
||||
|
||||
|
||||
# 不查询project信息的审批单类
|
||||
class ApproveModel(PublicApproveModel, table=True):
|
||||
__tablename__ = "pl_approve"
|
||||
__table_args__ = {'extend_existing': True}
|
||||
|
||||
proj_id: str = Field(default=None, description="所属项目id")
|
||||
|
||||
ApproveService = create_model_service(Cls=ApproveModel)
|
||||
@@ -1,11 +1,9 @@
|
||||
from decimal import Decimal
|
||||
from typing import Optional, List
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import computed_field
|
||||
from sqlalchemy.orm import selectinload
|
||||
from sqlmodel import Field, Relationship, select
|
||||
|
||||
from app.model.ApproveModel import ApproveModel
|
||||
from app.model.BasicModel import BasicModel
|
||||
from app.model.UserModel import UserServiceModel
|
||||
from app.utils.create_module_service import create_model_service
|
||||
@@ -45,41 +43,10 @@ class ProjectModel(BasicModel, table=True):
|
||||
def leader_name(self, value: Optional[str]) -> None:
|
||||
pass
|
||||
|
||||
# /*---------------------------------------approve_list-------------------------------------------*/
|
||||
|
||||
# approve_list_rel: Optional[List["ApproveModel"]] = Relationship(
|
||||
# sa_relationship_kwargs={
|
||||
# "foreign_keys": "ApproveModel.proj_id",
|
||||
# "primaryjoin": "ProjectModel.id == ApproveModel.proj_id",
|
||||
# }
|
||||
# )
|
||||
#
|
||||
# @computed_field
|
||||
# @property
|
||||
# def approve_list(self) -> Optional[List["ApproveModel"]]:
|
||||
# return self.approve_list_rel
|
||||
#
|
||||
# @approve_list.setter
|
||||
# def approve_list(self, value: Optional[List["ApproveModel"]]) -> None:
|
||||
# pass
|
||||
#
|
||||
# # /*---------------------------------------spent-------------------------------------------*/
|
||||
# @computed_field
|
||||
# @property
|
||||
# def spent(self) -> Decimal:
|
||||
# # return sum([approve.amount for approve in self.approve_list_rel if approve.status == 'approved'])
|
||||
# return 0
|
||||
#
|
||||
# @spent.setter
|
||||
# def spent(self, value: Decimal) -> None:
|
||||
# pass
|
||||
|
||||
|
||||
ProjectService = create_model_service(
|
||||
Cls=ProjectModel,
|
||||
custom_query=lambda: select(ProjectModel).options(
|
||||
selectinload(ProjectModel.leader),
|
||||
|
||||
# selectinload(ProjectModel.approve_list_rel),
|
||||
),
|
||||
)
|
||||
|
||||
Reference in New Issue
Block a user