Изменен ИС ЖКХ РС

This commit is contained in:
Gitea
2022-06-02 17:35:32 +09:00
parent c93a73cd52
commit 21e5ad26f2
14 changed files with 220 additions and 74 deletions

View File

@ -1,4 +1,6 @@
from decimal import Decimal
from unicodedata import decimal
from numpy import datetime_as_string
from pydantic import BaseModel
from typing import Optional, List
from datetime import date, datetime
@ -48,19 +50,6 @@ class AdvancedSearchInit(AccountInit, CityInit):
Patronymic: Optional[str] = None
class FilterTypeInit(BaseModel):
IDUser: int
GetType: int
NeedClear: bool
class FilterListInit(BaseModel):
IDUser: int = 1
IDFilterType: int
class FilterSetInit(FilterListInit):
IDFilterObject: int
class WithdrawingCheckSerializer(BaseModel):
@ -136,6 +125,12 @@ class WithdrawingTempInit(CashboxInit, GetTypeInit):
class WithdrawingCheckInit(PersonalAccountInit, GetTypeInit, DateInit):
pass
class AccrualsCanBeRecalculatedInit(BaseModel):
IDPersonalAccount: int
DateBegin: str
DateEnd: str
class WithdrawingSave(PersonalAccountInit, WithdrawingCheckSerializer, DateInit):
IDWithdrawingType: int
@ -161,12 +156,18 @@ class RecieptCalculateInit(PersonalAccountInit):
AmountFine: float
class ReceiptSaveInit(RecieptCalculateInit):
class ReceiptSaveInit(BaseModel):
IDUser: int
IDCashbox: int
IDType: int
IDPersonalAccount: int
IDDebtContract: int
IDService: int
DateBegin: date
DateEnd: date
IDMoneyType: int
Amount: float
AmountFine: float
Note: Optional[str] = None
@ -205,7 +206,7 @@ class MeteringDeviceTypeSerializer(BaseModel):
class PersonalAccountSerializer(BaseModel):
IDAddress: int
IDTenants: int
IDTenants: int = None
IDWorker: Optional[int] = None
Address: Optional[str] = None
ObjectStreetName: Optional[str] = None
@ -277,7 +278,7 @@ class EditPersonalAccountAddressInit(BaseModel):
class AddressDetailInfoSerializer(BaseModel):
IDAddress: int
CadastralNumber: Optional[str] = None
Privatization: bool
Privatization: float
Area: float
AreaOwned: float
AreaAdditional: float
@ -449,9 +450,9 @@ class PersonalAccountTOServicesSerializer(BaseModel):
DateEnd: Optional[str] = None
Spor: int
Por: int
IDTariffPopulation: int
Tariff: float
TariffProvider: float
IDTariffPopulation: int = None
Tariff: float = None
TariffProvider: float = None
StandartVolume: float = None
Volume: float
AmountSaldo: float
@ -618,14 +619,16 @@ class WithdrawingTypesSerializer(BaseModel):
class WithdrawingTempSerializer(BaseModel):
IDService: int
ServiceName: Optional[str] = None
Amount: float
class AccrualsCanBeRecalculatedSerializer(BaseModel):
id: int
IDService: int
ServiceName: Optional[str] = None
Por: int
AmountAccrued: float
Amount: float
class ObjectDetailsSerializer(BaseModel):
IDObject: str
IDFias: Optional[str] = None