VinokurovVE/service-app
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

last

Browse Source
This commit is contained in:
Gitea
2022-07-14 16:20:43 +09:00
parent 8d82068324
commit 8245c32224
3 changed files with 41 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
kv/crud.py
View File

@ -226,8 +226,8 @@ class ReportViewSet:
"""post""" """post"""
def repayment(db: Session, data: schemas.RentRegisterNoticeInit): def get_rent_register_notices(db: Session, data: schemas.RentRegisterNoticeInit):
return exec_procedure(db, 'uspGetRentRegisterNotices', **data) return exec_procedure(db, 'uspGetRentRegisterNotices', data.dict())
"""AccrualViewSet""" """AccrualViewSet"""
@ -388,7 +388,7 @@ class ReferenceViewSet:
return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all() return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all()
def get_address_types(db: Session): def get_address_types(db: Session):
tb = get_table('RefAddressType') tb = get_table('RefAddressType', 'General')
return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all() return db.query(tb).with_entities(tb.c["ID"], tb.c["Name"]).all()
"""post""" """post"""

6
kv/routers/report.py
View File

@ -9,7 +9,7 @@ router = APIRouter()
"""post""" """post"""
@router.post("/repayment", response_model=List[schemas.RentRegisterNotices]) @router.post("/get_rent_register_notices", response_model=List[schemas.RentRegisterNotices])
async def repayment(request: schemas.RentRegisterNoticeInit, db: Session = Depends(get_db)): async def get_rent_register_notices(request: schemas.RentRegisterNoticeInit, db: Session = Depends(get_db)):
data = crud.ReportViewSet.get_details(db, request) data = crud.ReportViewSet.get_rent_register_notices(db, request)
return data return data

68
kv/schemas.py
View File

@ -62,8 +62,8 @@ class RentRegisterNoticeInit(BaseModel):
IDUser: int = 1 IDUser: int = 1
IDCashbox: int = 1 IDCashbox: int = 1
IsRepayment: bool IsRepayment: bool
DateBegin: date DateBegin: str
DateEnd: date DateEnd: str
class ObjectMeteringDeviceAddressInit(BaseModel): class ObjectMeteringDeviceAddressInit(BaseModel):
@ -144,7 +144,9 @@ class RecalculationSave(BaseModel):
IDUser: int IDUser: int
IDService: int IDService: int
IDType: int IDType: int
Percent: float Percent: float = None
IDOldChange: str = None
IDNewChange: str = None
DateBegin: str DateBegin: str
DateEnd: str DateEnd: str
@ -326,34 +328,34 @@ class AddressDetailInfoSerializer(BaseModel):
class AddressDetailsSerializer(BaseModel): class AddressDetailsSerializer(BaseModel):
ID: int ID: int
IDObject: str IDObject: str
IDType: int IDType: int = None
IDImprovementDegree: int IDImprovementDegree: int = None
CadastralNumber: Optional[str] = None CadastralNumber: Optional[str] = None
Number: Optional[str] = None Number: Optional[str] = None
Privatization: bool Privatization: bool = None
Area: float Area: float = None
AreaOwned: float AreaOwned: float = None
AreaAboveNormal: float AreaAboveNormal: float = None
AreaAdditional: float AreaAdditional: float = None
RoomsNumber: int RoomsNumber: int = None
PeopleNumber: int PeopleNumber: int = None
PeopleWithoutReg: int PeopleWithoutReg: int = None
PeopleAway: int PeopleAway: int = None
PeopleDependents: int PeopleDependents: int = None
Glazing: bool Glazing: bool = None
IDSystemHotWater: int IDSystemHotWater: int = None
IDSystemHotWaterPeriodType: int IDSystemHotWaterPeriodType: int = None
IDSystemColdWater: int IDSystemColdWater: int = None
IDSystemColdWaterPeriodType: int IDSystemColdWaterPeriodType: int = None
IDSystemSewerage: int IDSystemSewerage: int = None
IDSystemSeweragePeriodType: int IDSystemSeweragePeriodType: int = None
IDStandartVolume: int IDStandartVolume: int = None
MeteringDeviceHeating: bool MeteringDeviceHeating: bool = None
MeteringDeviceHotWater: bool MeteringDeviceHotWater: bool = None
MeteringDeviceColdWater: bool MeteringDeviceColdWater: bool = None
ActAvailabilityMeteringDeviceInstallIDType: int ActAvailabilityMeteringDeviceInstallIDType: int = None
ActAvailabilityMeteringDeviceInstallHeating: bool ActAvailabilityMeteringDeviceInstallHeating: bool = None
ActAvailabilityMeteringDeviceInstallWater: bool ActAvailabilityMeteringDeviceInstallWater: bool = None
class EditAdressInit(AddressDetailsSerializer): class EditAdressInit(AddressDetailsSerializer):
@ -521,7 +523,7 @@ class FilterTypeSerializer(BaseModel):
class FilterListSerializer(BaseModel): class FilterListSerializer(BaseModel):
ID: int ID: str
Name: Optional[str] = None Name: Optional[str] = None
IsChecked: bool IsChecked: bool
@ -536,9 +538,9 @@ class RentRegisterNotices(BaseModel):
Number: Optional[str] = None Number: Optional[str] = None
Address: Optional[str] = None Address: Optional[str] = None
AccountFullName: Optional[str] = None AccountFullName: Optional[str] = None
Amount: float Amount: float = None
AmountFine: float AmountFine: float = None
AmountTotal: float AmountTotal: float = None
class PersonalAccountDebtSerilizer(BaseModel): class PersonalAccountDebtSerilizer(BaseModel):