From 5849291a2149fc5191a28a1c3103de55dc98f831 Mon Sep 17 00:00:00 2001
From: martsforever <martsforever@aliyun.com>
Date: Sun, 24 Aug 2025 02:25:18 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=A6=A5=E5=8D=8F=EF=BC=8C=E5=8F=AA?=
 =?UTF-8?q?=E8=83=BD=E5=9C=A8=E6=95=B0=E6=8D=AE=E5=BA=93=E4=B8=AD=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/model/ProjectModel.py   | 22 ++--------------------
 app/model/ProjectService.py |  8 +-------
 2 files changed, 3 insertions(+), 27 deletions(-)

diff --git a/app/model/ProjectModel.py b/app/model/ProjectModel.py
index 1749439..62de726 100644
--- a/app/model/ProjectModel.py
+++ b/app/model/ProjectModel.py
@@ -16,26 +16,8 @@ class ProjectModel(BasicModel, table=True):
   budget: float = Field(default=None, description="项目预算金额")
   version: int = Field(default=None, description="项目版本号")
 
-  # 使用 PrivateAttr 声明私有属性
-  _spent: Optional[Decimal] = PrivateAttr(default=None)
-  _balance: Optional[Decimal] = PrivateAttr(default=None)
-
-  # 属性访问器
-  @property
-  def spent(self) -> Optional[Decimal]:
-    return self._spent
-
-  @spent.setter
-  def spent(self, value: Optional[Decimal]) -> None:
-    self._spent = value
-
-  @property
-  def balance(self) -> Optional[Decimal]:
-    return self._balance
-
-  @balance.setter
-  def balance(self, value: Optional[Decimal]) -> None:
-    self._balance = value
+  spent: Decimal = Field(default=None, description="项目花费金额")
+  balance: Decimal = Field(default=None, description="项目预算余额")
 
   # /*---------------------------------------leader_id-------------------------------------------*/
 
diff --git a/app/model/ProjectService.py b/app/model/ProjectService.py
index 4b58d54..5b54a5d 100644
--- a/app/model/ProjectService.py
+++ b/app/model/ProjectService.py
@@ -22,7 +22,6 @@ ProjectService = create_model_service(
   after_batch_update=lambda refresh_cls_list, row_dict_list, session: set_list_spent(refresh_cls_list, session),
 )
 
-
 async def set_list_spent(cls_list: List[ProjectModel], session: AsyncSessionDep):
   project_dict_list, project_dict_map = await query_proj_spent([item.id for item in cls_list], session)
   for item in cls_list:
@@ -31,12 +30,6 @@ async def set_list_spent(cls_list: List[ProjectModel], session: AsyncSessionDep)
       item.spent = target['spent']
       item.balance = target['balance']
 
-  for item in cls_list:
-    print("==============>>>>>>>>>>>>")
-    print(item.id, item.spent, item.balance)
-    dict_val = item.model_dump()
-    print(dict_val.get('spent'), dict_val.get('balance'))
-
 
 async def set_item_spent(cls: ProjectModel, session: AsyncSessionDep):
   project_dict_list, project_dict_map = await query_proj_spent([cls.id], session)
@@ -61,4 +54,5 @@ async def query_proj_spent(proj_id_list: List[str], session: AsyncSessionDep):
     # 剩余金额
     dict_item['balance'] = Decimal(dict_item['budget']) - Decimal(dict_item['spent'])
   project_dict_map = {item['id']: item for item in project_dict_list}
+
   return project_dict_list, project_dict_map