Исправления

This commit is contained in:
Gitea
2022-05-30 12:07:03 +09:00
parent 5b4ea0486c
commit 076cf8513c
14 changed files with 40 additions and 33 deletions

View File

@ -38,8 +38,8 @@ def exec_procedure_wo_result(session, proc_name, params, database: str = None):
class PersonalAccountViewSet:
def get_turn_over(db: Session, data: schemas.PersonalAccountInit = None):
return exec_procedure(db, 'uspGetPersonalAccountTurnOver', **data)
def get_turn_over(db: Session, IDPersonalAccount: int = None):
return exec_procedure(db, 'uspGetPersonalAccountTurnOver', {'IDPersonalAccount': IDPersonalAccount})
def get_details(db: Session, id: int = None):
table = get_table("PersonalAccount")
@ -48,14 +48,14 @@ class PersonalAccountViewSet:
def get_services(db: Session, IDPersonalAccount: int = None):
return exec_procedure(db, 'uspGetPersonalAccountServices', {'IDPersonalAccount': IDPersonalAccount})
def get_debt(db: Session, data: schemas.PersonalAccount = None):
return exec_procedure(db, 'uspGetPersonalAccountDebt', **data)
def get_debt(db: Session, data: schemas.PersonalAccountInit = None):
return exec_procedure(db, 'uspGetPersonalAccountDebt', data.dict())
def get_debts(db: Session, data: schemas.PersonalAccountType = None):
return exec_procedure(db, 'uspGetPersonalAccountDebts', **data)
return exec_procedure(db, 'uspGetPersonalAccountDebts', data.dict())
def get_financial_account(db: Session, data: schemas.PersonalAccountReportTOFinancialInit = None):
return exec_procedure(db, 'uspGetPersonalAccountReportTOFinancialAccount', **data)
return exec_procedure(db, 'uspGetPersonalAccountReportTOFinancialAccount', data.dict())
"""AddressInfoViewSet"""
@ -77,7 +77,7 @@ class AddressInfoViewSet:
def get_address_personal_accounts(db: Session, IDAddress: int = None):
return exec_procedure(db, 'uspGetAddressPersonalAccounts', {'IDAddress': IDAddress})
def retrieve(db: Session, id: int = None):
def get_address_object_details(db: Session, id: int = None):
return exec_procedure(db, 'uspGetAddressAndObjectDetails', {'ID': id})
def get_metering_devices(db: Session, IDAddress: int = None):
@ -235,7 +235,7 @@ class ReportViewSet:
"""ReportFilterViewSet"""
class ReportFilterViewSet:
class FilterViewSet:
"""get"""
"""post"""
@ -246,7 +246,7 @@ class ReportFilterViewSet:
def get_filter_list(db: Session, data: schemas.FilterListInit):
return exec_procedure(db, 'uspGetFilterList', data.dict())
def set_report_filter_list(db: Session, data: schemas.ReportFilterSetInit):
def set_filter_list(db: Session, data: schemas.FilterSetInit):
return exec_procedure_wo_result(db, 'uspSetFilterList', data.dict())
@ -265,7 +265,7 @@ class AccrualViewSet:
"""WithdrawingViewSet"""
class WithdrawingViewSet:
class RecalculationViewSet:
"""get"""
def get_withdrawing_types(db: Session):