Исправления
This commit is contained in:
163
kv/schemas.py
163
kv/schemas.py
@ -5,6 +5,8 @@ from pydantic import BaseModel
|
||||
from typing import Optional, List
|
||||
from datetime import date, datetime
|
||||
|
||||
from sqlalchemy import SmallInteger, null
|
||||
|
||||
|
||||
class AddObjectInit(BaseModel):
|
||||
IDCity: int
|
||||
@ -126,7 +128,7 @@ class WithdrawingCheckInit(PersonalAccountInit, GetTypeInit, DateInit):
|
||||
pass
|
||||
|
||||
class AccrualsCanBeRecalculatedInit(BaseModel):
|
||||
IDPersonalAccount: int
|
||||
IDUser: int
|
||||
DateBegin: str
|
||||
DateEnd: str
|
||||
|
||||
@ -138,6 +140,14 @@ class WithdrawingSave(PersonalAccountInit, WithdrawingCheckSerializer, DateInit)
|
||||
IDProviderContract: int
|
||||
IDManagementCompany: int
|
||||
|
||||
class RecalculationSave(BaseModel):
|
||||
IDUser: int
|
||||
IDService: int
|
||||
IDType: int
|
||||
Percent: float
|
||||
DateBegin: str
|
||||
DateEnd: str
|
||||
|
||||
|
||||
class RepaymentInfoInit(BaseModel):
|
||||
IDCashbox: int
|
||||
@ -161,10 +171,10 @@ class ReceiptSaveInit(BaseModel):
|
||||
IDCashbox: int
|
||||
IDType: int
|
||||
IDPersonalAccount: int
|
||||
IDDebtContract: int
|
||||
IDService: int
|
||||
DateBegin: date
|
||||
DateEnd: date
|
||||
IDDebtContract: int = None
|
||||
IDService: int = None
|
||||
DateBegin: str
|
||||
DateEnd: str
|
||||
IDMoneyType: int
|
||||
Amount: float
|
||||
AmountFine: float
|
||||
@ -384,25 +394,25 @@ class TOArchiveReceiptSerializer(BaseModel):
|
||||
|
||||
|
||||
class ReportTOFinancialAccount(BaseModel):
|
||||
por: int
|
||||
por: int = None
|
||||
ServiceName: Optional[str] = None
|
||||
ProviderName: Optional[str] = None
|
||||
DateBegin: date
|
||||
DateEnd: date
|
||||
StandartVolume: float
|
||||
TariffPopulation: float
|
||||
TariffProvider: float
|
||||
AmountSaldoBegin: float
|
||||
AmountTotalAccrued: float
|
||||
AmountAccruedSubsidy: float
|
||||
AmountAccrued: float
|
||||
AmountSubsidy: float
|
||||
AmountWithdrawing: float
|
||||
AmountActualAccrued: float
|
||||
AmountReceipt: float
|
||||
AmountSaldoCorrect: float
|
||||
AmountAccruedPreferential: float
|
||||
AmountSaldoEnd: float
|
||||
DateBegin: str = None
|
||||
DateEnd: str = None
|
||||
StandartVolume: float = None
|
||||
TariffPopulation: float = None
|
||||
TariffProvider: float = None
|
||||
AmountSaldoBegin: float = None
|
||||
AmountTotalAccrued: float = None
|
||||
AmountAccruedSubsidy: float = None
|
||||
AmountAccrued: float = None
|
||||
AmountSubsidy: float = None
|
||||
AmountWithdrawing: float = None
|
||||
AmountActualAccrued: float = None
|
||||
AmountReceipt: float = None
|
||||
AmountSaldoCorrect: float = None
|
||||
AmountAccruedPreferential: float = None
|
||||
AmountSaldoEnd: float = None
|
||||
|
||||
|
||||
class MoneyTypesSerializer(BaseModel):
|
||||
@ -486,6 +496,11 @@ class ReceiptCalculatedSerializer(BaseModel):
|
||||
ServiceName: Optional[str] = None
|
||||
Amount: float
|
||||
|
||||
class ReceiptSaveSerializer(BaseModel):
|
||||
IDService: int
|
||||
ServiceName: Optional[str] = None
|
||||
Amount: float
|
||||
|
||||
|
||||
class RentRepaymentInfoSerializer(BaseModel):
|
||||
Name: Optional[str] = None
|
||||
@ -627,52 +642,53 @@ class AccrualsCanBeRecalculatedSerializer(BaseModel):
|
||||
id: int
|
||||
IDService: int
|
||||
ServiceName: Optional[str] = None
|
||||
Volume: float
|
||||
Amount: float
|
||||
|
||||
class ObjectDetailsSerializer(BaseModel):
|
||||
IDObject: str
|
||||
IDObject: str = None
|
||||
IDFias: Optional[str] = None
|
||||
IDBoiler: str
|
||||
IDOwnershipType: int
|
||||
IDProviderUtilityServices: int
|
||||
BuildDate: int
|
||||
FloorNumber: int
|
||||
Entrance: int
|
||||
CommissDate: date
|
||||
Volume: float
|
||||
FullArea: float
|
||||
IDBoiler: str = None
|
||||
IDOwnershipType: int = None
|
||||
IDProviderUtilityServices: int = None
|
||||
BuildDate: int = None
|
||||
FloorNumber: int = None
|
||||
Entrance: int = None
|
||||
CommissDate: date = None
|
||||
Volume: float = None
|
||||
FullArea: float = None
|
||||
IDBuildingType: Optional[str] = None
|
||||
IDOverlappingType: int
|
||||
IDWallMaterial: int
|
||||
IDRoofType: int
|
||||
IDFoundationType: int
|
||||
WithdrawingDate: date
|
||||
IDOverlappingType: int = None
|
||||
IDWallMaterial: int = None
|
||||
IDRoofType: int = None
|
||||
IDFoundationType: int = None
|
||||
WithdrawingDate: date = None
|
||||
WithdrawingReason: Optional[str] = None
|
||||
IDSystemHotWater: int
|
||||
IDSystemHotWaterPeriodType: int
|
||||
IDSystemColdWater: int
|
||||
IDSystemColdWaterPeriodType: int
|
||||
IDSystemSewerage: int
|
||||
IDStandartVolume: int
|
||||
IDHeatingType: int
|
||||
IDGasType: int
|
||||
IDWiringType: int
|
||||
IDImprovementDegree: int
|
||||
Amount: float
|
||||
Deterioration: float
|
||||
AreaRoof: float
|
||||
AreaFoundation: float
|
||||
AreaFacade: float
|
||||
AreaPlub: float
|
||||
AreaAttic: float
|
||||
AreaTechnicalFloor: float
|
||||
AreaBuilding: float
|
||||
AreaLk: float
|
||||
AreaYardArea: float
|
||||
AreaBoiler: float
|
||||
ActAvailabilityCounterInstallObjectHeating: int
|
||||
ActAvailabilityCounterInstallObjectWater: int
|
||||
DirectControl: bool
|
||||
IDSystemHotWater: int = None
|
||||
IDSystemHotWaterPeriodType: int = None
|
||||
IDSystemColdWater: int = None
|
||||
IDSystemColdWaterPeriodType: int = None
|
||||
IDSystemSewerage: int = None
|
||||
IDStandartVolume: int = None
|
||||
IDHeatingType: int = None
|
||||
IDGasType: int = None
|
||||
IDWiringType: int = None
|
||||
IDImprovementDegree: int = None
|
||||
Amount: float = None
|
||||
Deterioration: float = None
|
||||
AreaRoof: float = None
|
||||
AreaFoundation: float = None
|
||||
AreaFacade: float = None
|
||||
AreaPlub: float = None
|
||||
AreaAttic: float = None
|
||||
AreaTechnicalFloor: float = None
|
||||
AreaBuilding: float = None
|
||||
AreaLk: float = None
|
||||
AreaYardArea: float = None
|
||||
AreaBoiler: float = None
|
||||
ActAvailabilityCounterInstallObjectHeating: int = None
|
||||
ActAvailabilityCounterInstallObjectWater: int = None
|
||||
DirectControl: bool = None
|
||||
|
||||
|
||||
class ObjectMunicipalsSerializer(BaseModel):
|
||||
@ -683,15 +699,15 @@ class ObjectMunicipalsSerializer(BaseModel):
|
||||
class ObjectServicesSerializer(BaseModel):
|
||||
id: int
|
||||
IDService: int
|
||||
IDProviderContract: int
|
||||
IDProviderContract: int = None
|
||||
ServiceName: Optional[str] = None
|
||||
por: int
|
||||
por: int = None
|
||||
ProviderName: Optional[str] = None
|
||||
DateBegin: date
|
||||
DateEnd: date
|
||||
IDTariffPopulation: int
|
||||
TariffPopAmount: float
|
||||
TariffProvAmount: float
|
||||
DateBegin: date = None
|
||||
DateEnd: date = None
|
||||
IDTariffPopulation: int = None
|
||||
TariffPopAmount: float = None
|
||||
TariffProvAmount: float = None
|
||||
|
||||
|
||||
class ObjectAddressesSerializer(BaseModel):
|
||||
@ -780,6 +796,7 @@ class ObjectWaterSystemVolumesInit(BaseModel):
|
||||
IDHotWater: int
|
||||
IDColdWater: int
|
||||
IDSewerage: int
|
||||
|
||||
|
||||
|
||||
class TariffPopulationSerializer(BaseModel):
|
||||
@ -813,3 +830,11 @@ class ProviderUtilityService(BaseModel):
|
||||
CorrectAccount: str
|
||||
BIK: str
|
||||
WorkTime: Optional[str] = None
|
||||
|
||||
class ReportTOFinancialAccountInit(BaseModel):
|
||||
IDUser: int
|
||||
IDCashbox: int
|
||||
IDPersonalAccount: int
|
||||
Month: int
|
||||
vid: bool
|
||||
IsAUP: bool
|
||||
|
Reference in New Issue
Block a user