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

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

Binary file not shown.

View File

@ -208,7 +208,7 @@ class PaymentViewSet:
def save_receipt(db: Session, data: schemas.ReceiptSaveInit = None):
try:
exec_procedure_wo_result(db, 'uspSaveReceipt', **data)
exec_procedure_wo_result(db, 'uspSaveReceipt', data.dict())
return {'msg': 'success'}
except:
return {'msg': 'error'}
@ -232,24 +232,6 @@ class ReportViewSet:
return exec_procedure(db, 'uspGetRentRegisterNotices', **data)
"""ReportFilterViewSet"""
class FilterViewSet:
"""get"""
"""post"""
def get_filter_types(db: Session, data: schemas.FilterTypeInit):
return exec_procedure(db, 'uspGetFilterTypes', data.dict())
def get_filter_list(db: Session, data: schemas.FilterListInit):
return exec_procedure(db, 'uspGetFilterList', data.dict())
def set_filter_list(db: Session, data: schemas.FilterSetInit):
return exec_procedure_wo_result(db, 'uspSetFilterList', data.dict())
"""AccrualViewSet"""
@ -279,6 +261,9 @@ class RecalculationViewSet:
def get_withdrawing_temp(db: Session, data: schemas.WithdrawingTempInit):
return exec_procedure(db, 'uspGetWithdrawingTemp', **data)
def get_accruals_can_be_recalculated(db: Session, data: schemas.AccrualsCanBeRecalculatedInit):
return exec_procedure(db, 'uspGetAccrualsCanBeRecalculated', data.dict())
def save_withdrawing(db: Session, data: schemas.WithdrawingSave = None):
try:
exec_procedure_wo_result(db, 'uspSaveWithdrawing', **data)

View File

@ -1,6 +1,6 @@
from fastapi import Depends, APIRouter
from requests import Session
from kv.routers import address, objectvs, payment, personalaccount, reference, report, accrual, filter, turnover, recalculation
from kv.routers import address, objectvs, payment, personalaccount, reference, report, accrual, turnover, recalculation
from kv.database import get_db, get_table
from typing import List
from kv import schemas
@ -47,8 +47,6 @@ router.include_router(reference.router, prefix="/reference", tags=["ReferenceVie
router.include_router(report.router, prefix="/report", tags=["ReportViewSet"])
router.include_router(filter.router, prefix="/filter", tags=["FilterViewSet"])
router.include_router(turnover.router, prefix="/turnover", tags=["TurnOverViewSet"])
router.include_router(recalculation.router, prefix="/recalculation", tags=["RecalculationViewSet"])

View File

@ -1,24 +0,0 @@
import kv.schemas as schemas
import kv.crud as crud
from kv.database import get_db
from sqlalchemy.orm import Session
from fastapi import APIRouter, Depends
from typing import List
router = APIRouter()
"""post"""
@router.post('/get_filter_types', response_model=List[schemas.FilterTypeSerializer])
async def get_filter_types(request: schemas.FilterTypeInit, db: Session = Depends(get_db)):
return crud.FilterViewSet.get_filter_types(db, request)
@router.post('/get_filter_list', response_model=List[schemas.FilterListSerializer])
async def get_filter_list(request: schemas.FilterListInit, db: Session = Depends(get_db)):
return crud.FilterViewSet.get_filter_list(db, request)
@router.post('/set_report_filter_list', response_model=List[schemas.FilterListSerializer])
async def set_report_filter_list(request: schemas.FilterSetInit, db: Session = Depends(get_db)):
return crud.FilterViewSet.set_filter_list(db, request)

View File

@ -27,6 +27,10 @@ async def set_report_filter_list(request: schemas.WithdrawingCheckInit, db: Sess
async def get_withdrawing_temp(request: schemas.WithdrawingTempInit, db: Session = Depends(get_db)):
return crud.RecalculationViewSet.get_withdrawing_temp(db, request)
@router.post('/get_accruals_can_be_recalculated', response_model=List[schemas.AccrualsCanBeRecalculatedSerializer])
async def get_accruals_can_be_recalculated(request: schemas.AccrualsCanBeRecalculatedInit, db: Session = Depends(get_db)):
return crud.RecalculationViewSet.get_accruals_can_be_recalculated(db, request)
@router.post('/save_withdrawing')
async def save_withdrawing(request: schemas.WithdrawingSave, db: Session = Depends(get_db)):

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