整合合同费用并移除旧财务合同

backend/app/schemas/contract_fee.py

@@ -12,7 +12,11 @@ from app.schemas.fee_attachment import FeeAttachmentRead
 class ContractFeeCreate(BaseModel):
     project_id: uuid.UUID
     center_id: uuid.UUID
+    contract_no: Optional[str] = None
+    signed_date: Optional[date] = None
     contract_amount: Decimal = Field(ge=0)
+    currency: str = "CNY"
+    remark: Optional[str] = None
     contract_cases: int = Field(ge=0)
     actual_cases: Optional[int] = Field(default=None, ge=0)
     settlement_amount: Optional[Decimal] = Field(default=None, ge=0)
@@ -20,7 +24,11 @@ class ContractFeeCreate(BaseModel):
 
 
 class ContractFeeUpdate(BaseModel):
+    contract_no: Optional[str] = None
+    signed_date: Optional[date] = None
     contract_amount: Optional[Decimal] = Field(default=None, ge=0)
+    currency: Optional[str] = None
+    remark: Optional[str] = None
     contract_cases: Optional[int] = Field(default=None, ge=0)
     actual_cases: Optional[int] = Field(default=None, ge=0)
     settlement_amount: Optional[Decimal] = Field(default=None, ge=0)
@@ -31,7 +39,11 @@ class ContractFeeRead(BaseModel):
     id: uuid.UUID
     project_id: uuid.UUID
     center_id: uuid.UUID
+    contract_no: Optional[str]
+    signed_date: Optional[date]
     contract_amount: Decimal
+    currency: str
+    remark: Optional[str]
     contract_cases: int
     actual_cases: Optional[int]
     settlement_amount: Optional[Decimal]

backend/app/schemas/finance_contract.py

@@ -1,40 +0,0 @@
-import uuid
-from datetime import date, datetime
-from decimal import Decimal
-from typing import Optional
-
-from pydantic import BaseModel, ConfigDict, Field
-
-
-class FinanceContractCreate(BaseModel):
-    site_name: str
-    contract_no: str
-    signed_date: Optional[date] = None
-    amount: Decimal = Field(gt=0)
-    currency: str = "CNY"
-    remark: Optional[str] = None
-
-
-class FinanceContractUpdate(BaseModel):
-    site_name: Optional[str] = None
-    contract_no: Optional[str] = None
-    signed_date: Optional[date] = None
-    amount: Optional[Decimal] = Field(default=None, gt=0)
-    currency: Optional[str] = None
-    remark: Optional[str] = None
-
-
-class FinanceContractRead(BaseModel):
-    id: uuid.UUID
-    study_id: uuid.UUID
-    site_name: str
-    contract_no: str
-    signed_date: Optional[date]
-    amount: Decimal
-    currency: str
-    remark: Optional[str]
-    created_by: Optional[uuid.UUID]
-    created_at: datetime
-    updated_at: datetime
-
-    model_config = ConfigDict(from_attributes=True)