diff --git a/app/model/ApproveModel.py b/app/model/ApproveModel.py deleted file mode 100644 index 2405b63..0000000 --- a/app/model/ApproveModel.py +++ /dev/null @@ -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) diff --git a/app/model/ProjectModel.py b/app/model/ProjectModel.py index 3bf8138..2f78f71 100644 --- a/app/model/ProjectModel.py +++ b/app/model/ProjectModel.py @@ -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), ), ) diff --git a/app/server.py b/app/server.py index af4d465..0959efb 100644 --- a/app/server.py +++ b/app/server.py @@ -18,7 +18,6 @@ from app.controller.test_sqlmodel import add_test_sqlmodel_route from app.controller.test_sync import add_test_sync_route from app.controller.translate_controller import add_translate_route from app.create_app import create_app -from app.model.ApproveModel import ApproveService from app.model.ApproveProjModel import ApproveProjService from app.model.LgApprove import LgApproveService from app.model.LgChat import LgChatService @@ -96,7 +95,6 @@ ReimburseService.add_route(app=app, path="/reimburse") ReimburseTravelService.add_route(app=app, path="/reimburse_travel") ReimburseOtherService.add_route(app=app, path="/reimburse_other") ApproveProjService.add_route(app=app, path="/approve_proj") -ApproveService.add_route(app=app, path="/approve") if __name__ == "__main__": run_uvicorn()