|
@@ -225,7 +225,7 @@ async def delete_institution_controller(
|
|
|
auth: Annotated[AuthSchema, Depends(AuthPermission(["module_payment:expense:institution:delete"]))],
|
|
auth: Annotated[AuthSchema, Depends(AuthPermission(["module_payment:expense:institution:delete"]))],
|
|
|
) -> JSONResponse:
|
|
) -> JSONResponse:
|
|
|
"""删除费控制度"""
|
|
"""删除费控制度"""
|
|
|
- institution_delete_model = AlipayEbppInvoiceInstitutionDeleteModel(**data)
|
|
|
|
|
|
|
+ institution_delete_model = AlipayEbppInvoiceInstitutionDeleteModel.from_alipay_dict(data)
|
|
|
result = await InstitutionService.delete_institution_service(auth=auth, data=institution_delete_model)
|
|
result = await InstitutionService.delete_institution_service(auth=auth, data=institution_delete_model)
|
|
|
log.info(f"删除费控制度成功: institution_id={institution_delete_model.institution_id}, enterprise_id={institution_delete_model.enterprise_id}")
|
|
log.info(f"删除费控制度成功: institution_id={institution_delete_model.institution_id}, enterprise_id={institution_delete_model.enterprise_id}")
|
|
|
return SuccessResponse(data=result, msg="删除费控制度成功")
|
|
return SuccessResponse(data=result, msg="删除费控制度成功")
|
|
@@ -265,7 +265,7 @@ async def modify_institution_controller(
|
|
|
EXPENSE_TYPE_MAP = {"GENERAL": "DEFAULT", "DEFAULT": "DEFAULT"}
|
|
EXPENSE_TYPE_MAP = {"GENERAL": "DEFAULT", "DEFAULT": "DEFAULT"}
|
|
|
if data.get("expense_type") in EXPENSE_TYPE_MAP:
|
|
if data.get("expense_type") in EXPENSE_TYPE_MAP:
|
|
|
data["expense_type"] = EXPENSE_TYPE_MAP[data["expense_type"]]
|
|
data["expense_type"] = EXPENSE_TYPE_MAP[data["expense_type"]]
|
|
|
- institution_modify_model = AlipayEbppInvoiceInstitutionModifyModel(**data)
|
|
|
|
|
|
|
+ institution_modify_model = AlipayEbppInvoiceInstitutionModifyModel.from_alipay_dict(data)
|
|
|
result = await InstitutionService.modify_institution_service(
|
|
result = await InstitutionService.modify_institution_service(
|
|
|
auth=auth, data=institution_modify_model, raw_data=data
|
|
auth=auth, data=institution_modify_model, raw_data=data
|
|
|
)
|
|
)
|