feat(bx): add list Excel export for reimbursement module pages

Wire ListExportDropdown on advance/reimburse/payment/expense/view/wallet lists, with matching POST export endpoints.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
zlwuandCursor committed 2026-08-21 18:34:22 +08:00
1 parent fe15a130cb
commit dbba755fd8
16 files changed
+901 -11

No files matched your search

+70 -1
View File
@@ -1,8 +1,17 @@
from typing import List
from typing import List, Optional
from fastapi import APIRouter, Depends, HTTPException, status
from pydantic import BaseModel, Field
from sqlalchemy.orm import Session
from app.api.bx.export_common import (
ExportColumn,
ExportValidationError,
BxExportBodyBase,
dump_export_row,
respond_xlsx,
status_label,
)
from app.core.bx_auth import BxUserContext, get_bx_current_user
from app.core.database import get_db
from app.core.tenant_context import get_tenant_no
@@ -23,6 +32,66 @@ def get_expense_item_tree(
return ApiResponse(data=[ExpenseItemOut.model_validate(i) for i in tree])
EXPENSE_ITEM_EXPORT_COLUMNS = [
ExportColumn(title="项目名称", field="itemName"),
ExportColumn(title="项目编码", field="itemCode"),
ExportColumn(title="层级", field="level"),
ExportColumn(title="子项数", field="childCount"),
ExportColumn(title="排序", field="sortOrder"),
ExportColumn(title="状态", field="status"),
]
class ExpenseItemExportBody(BxExportBodyBase):
name: Optional[str] = None
status: Optional[str] = None
def _flatten_expense_tree(nodes: list, out: list) -> None:
for n in nodes:
out.append(n)
children = getattr(n, "children", None) or (n.get("children") if isinstance(n, dict) else None) or []
if children:
_flatten_expense_tree(list(children), out)
@router.post("/export")
def export_expense_items(
body: ExpenseItemExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
tree = ExpenseItemService.get_item_tree(db, tenant_no, user=user)
flat: list = []
_flatten_expense_tree(list(tree), flat)
outs = [ExpenseItemOut.model_validate(i) for i in flat]
if body.ids:
id_set = {str(i) for i in body.ids}
outs = [o for o in outs if str(o.id) in id_set]
if body.name:
kw = body.name.strip()
outs = [o for o in outs if kw in (o.item_name or "")]
if body.status not in (None, ""):
outs = [o for o in outs if str(o.status) == str(body.status)]
rows = []
for o in outs:
data = dump_export_row(o, status_fields=())
data["status"] = status_label(data.get("status"))
# childCount may be computed
if "childCount" not in data:
data["childCount"] = len(getattr(o, "children", None) or [])
rows.append(data)
return respond_xlsx(
db, tenant_no=tenant_no, sheet_title="费用科目", columns=EXPENSE_ITEM_EXPORT_COLUMNS,
rows=rows, filename_stem="费用科目", requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.get("/{item_id}", response_model=ApiResponse[ExpenseItemOut])
def get_expense_item(
item_id: str,
+49
View File
@@ -5,7 +5,16 @@ from fastapi import APIRouter, Depends, HTTPException, Request, status, Query
from sqlalchemy.orm import Session
from starlette.datastructures import UploadFile as StarletteUploadFile
from app.api.bx.export_common import (
EXPORT_MAX_ROWS,
ExportColumn,
ExportValidationError,
BxExportBodyBase,
dump_export_row,
respond_xlsx,
)
from app.core.bx_auth import BxUserContext, get_bx_current_user
from app.core.tenant_context import get_tenant_no
from app.core.database import get_db
from app.schemas.bx.common import ApiResponse, PagedData
from app.schemas.bx.invoice import InvoiceOut, LedgerOut, WalletSummaryOut
@@ -39,6 +48,46 @@ def list_invoice_wallets(
return ApiResponse(data=PagedData(rows=out_rows, total=total, page=page, page_size=pageSize))
WALLET_EXPORT_COLUMNS = [
ExportColumn(title="员工", field="ownerUserName"),
ExportColumn(title="总额(元)", field="totalAmount"),
ExportColumn(title="已报销占用(元)", field="usedAmount"),
ExportColumn(title="余额(元)", field="balance"),
ExportColumn(title="发票张数", field="invoiceCount"),
]
class WalletExportBody(BxExportBodyBase):
keyword: str = ""
@router.post("/invoice-wallets/export")
def export_invoice_wallets(
body: WalletExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = get_tenant_no(db, user.to_tenant_user_dict())
rows, _ = InvoiceService.list_wallets(
db, user=user, page=1, page_size=EXPORT_MAX_ROWS, keyword=body.keyword or ""
)
outs = [WalletSummaryOut.model_validate(InvoiceService._summary_to_dict(r)) for r in rows]
if body.ids:
id_set = {str(i) for i in body.ids}
# wallet may key by ownerUserId
outs = [o for o in outs if str(getattr(o, "owner_user_id", None) or getattr(o, "id", "")) in id_set or str(o.model_dump(by_alias=True).get("ownerUserId") or o.model_dump(by_alias=True).get("id") or "") in id_set]
export_rows = [dump_export_row(o, status_fields=()) for o in outs]
return respond_xlsx(
db, tenant_no=tenant_no, sheet_title="发票夹", columns=WALLET_EXPORT_COLUMNS,
rows=export_rows, filename_stem="发票夹汇总", requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.get("/invoices", response_model=ApiResponse[PagedData[InvoiceOut]])
def list_invoices(
page: int = 1,
+165
View File
@@ -5,10 +5,20 @@ from typing import Any, List, Optional
from urllib.parse import quote
from fastapi import APIRouter, Depends, HTTPException, status, Query
from pydantic import Field
from fastapi.responses import StreamingResponse
from sqlalchemy import or_
from sqlalchemy.orm import Session
from app.api.bx.export_common import (
EXPORT_MAX_ROWS,
ExportColumn,
ExportValidationError,
BxApplyListExportBody,
dump_export_row,
issue_status_label,
respond_xlsx,
)
from app.core.bx_auth import BxUserContext, get_bx_current_user
from app.core.database import get_db
from app.core.tenant_context import get_tenant_no
@@ -251,6 +261,161 @@ def advance_issue_stats(
return ApiResponse(data=AdvanceFinanceIssueStatsOut.model_validate(data))
PAYMENT_EXPORT_COLUMNS = [
ExportColumn(title="申请单号", field="applyCode"),
ExportColumn(title="申请时间", field="applyTime"),
ExportColumn(title="申请人", field="applicantName"),
ExportColumn(title="报销主题", field="title"),
ExportColumn(title="金额(元)", field="amount"),
ExportColumn(title="冲抵金额(元)", field="offsetAmount"),
ExportColumn(title="实付金额(元)", field="payAmount"),
ExportColumn(title="处理状态", field="status"),
ExportColumn(title="支付时间", field="payTime"),
]
ADVANCE_ISSUE_EXPORT_COLUMNS = [
ExportColumn(title="申请单号", field="applyCode"),
ExportColumn(title="申请时间", field="applyTime"),
ExportColumn(title="申请人", field="applicantName"),
ExportColumn(title="申请原因", field="reason"),
ExportColumn(title="申请金额(元)", field="amount"),
ExportColumn(title="实际发放金额(元)", field="actualAmount"),
ExportColumn(title="冲抵总金额(元)", field="offsetAmount"),
ExportColumn(title="审批通过时间", field="approveTime"),
ExportColumn(title="发放时间", field="issueTime"),
ExportColumn(title="发放人", field="issueUserName"),
ExportColumn(title="发放状态", field="issueStatus"),
]
class PaymentExportBody(BxApplyListExportBody):
issue_status: Optional[str] = Field(default=None, alias="issueStatus")
@router.post("/pending/export")
def export_pending_payments(
body: BxApplyListExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
filters = [BxReimburseApply.status == "approved"]
if body.keyword:
filters.append(
or_(
BxReimburseApply.apply_code.contains(body.keyword),
BxReimburseApply.applicant_name.contains(body.keyword),
)
)
if body.applicant_id:
filters.append(BxReimburseApply.applicant_id == str(body.applicant_id).strip())
if body.ids:
filters.append(BxReimburseApply.id.in_([str(i) for i in body.ids]))
append_create_time_filters(
filters, BxReimburseApply,
apply_date=body.apply_date, apply_date_from=body.apply_date_from, apply_date_to=body.apply_date_to,
)
rows, _ = ReimburseService.get_paged(
db, tenant_no, page=1, page_size=EXPORT_MAX_ROWS, filters=filters, user=user
)
outs = ReimburseService.out_rows_with_attachment_counts(db, tenant_no, list(rows))
export_rows = [dump_export_row(o) for o in outs]
return respond_xlsx(
db, tenant_no=tenant_no, sheet_title="待付款", columns=PAYMENT_EXPORT_COLUMNS,
rows=export_rows, filename_stem="报销待付款", requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.post("/processed/export")
def export_processed_payments(
body: BxApplyListExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
filters = [BxReimburseApply.status.in_(["processed", "paid", "offset"])]
if body.keyword:
filters.append(
or_(
BxReimburseApply.apply_code.contains(body.keyword),
BxReimburseApply.applicant_name.contains(body.keyword),
)
)
if body.applicant_id:
filters.append(BxReimburseApply.applicant_id == str(body.applicant_id).strip())
if body.ids:
filters.append(BxReimburseApply.id.in_([str(i) for i in body.ids]))
append_create_time_filters(
filters, BxReimburseApply,
apply_date=body.apply_date, apply_date_from=body.apply_date_from, apply_date_to=body.apply_date_to,
)
rows, _ = ReimburseService.get_paged(
db, tenant_no, page=1, page_size=EXPORT_MAX_ROWS, filters=filters, user=user
)
outs = ReimburseService.out_rows_with_attachment_counts(db, tenant_no, list(rows))
export_rows = [dump_export_row(o) for o in outs]
return respond_xlsx(
db, tenant_no=tenant_no, sheet_title="已付款", columns=PAYMENT_EXPORT_COLUMNS,
rows=export_rows, filename_stem="报销已付款", requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.post("/advance-issues/export-xlsx")
def export_advance_issues_xlsx(
body: PaymentExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
filters = []
issue_status = body.issue_status
if issue_status == "pending":
filters.append(BxAdvanceApply.status == "approved")
filters.append(or_(BxAdvanceApply.issue_status.is_(None), BxAdvanceApply.issue_status != "issued"))
elif issue_status == "issued":
filters.append(BxAdvanceApply.status == "issued")
else:
filters.append(or_(BxAdvanceApply.status == "approved", BxAdvanceApply.status == "issued"))
if body.keyword:
filters.append(
or_(
BxAdvanceApply.apply_code.contains(body.keyword),
BxAdvanceApply.applicant_name.contains(body.keyword),
)
)
if body.applicant_id:
filters.append(BxAdvanceApply.applicant_id == str(body.applicant_id).strip())
if body.ids:
filters.append(BxAdvanceApply.id.in_([str(i) for i in body.ids]))
append_create_time_filters(
filters, BxAdvanceApply,
apply_date=body.apply_date, apply_date_from=body.apply_date_from, apply_date_to=body.apply_date_to,
)
rows, _ = AdvanceService.get_paged(
db, tenant_no, page=1, page_size=EXPORT_MAX_ROWS, filters=filters, user=user
)
out_rows = [AdvanceIssueOut.model_validate(r) for r in rows]
export_rows = []
for o in out_rows:
data = dump_export_row(o, status_fields=())
data["issueStatus"] = issue_status_label(getattr(o, "issue_status", None) or data.get("issueStatus"))
export_rows.append(data)
return respond_xlsx(
db, tenant_no=tenant_no, sheet_title="备用金发放", columns=ADVANCE_ISSUE_EXPORT_COLUMNS,
rows=export_rows, filename_stem="备用金发放", requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.get("/advance-issues/export")
def export_advance_issues(
issue_status: Optional[str] = None,
+189
View File
@@ -8,6 +8,14 @@ from fastapi.responses import StreamingResponse
from sqlalchemy import or_
from sqlalchemy.orm import Session
from app.api.bx.export_common import (
EXPORT_MAX_ROWS,
ExportColumn,
ExportValidationError,
BxApplyListExportBody,
dump_export_row,
respond_xlsx,
)
from app.core.bx_auth import BxUserContext, get_bx_current_user
from app.core.database import get_db
from app.core.tenant_context import get_tenant_no
@@ -42,6 +50,54 @@ def _tenant(db: Session, user: BxUserContext) -> str:
return get_tenant_no(db, user.to_tenant_user_dict())
REIMBURSE_EXPORT_COLUMNS = [
ExportColumn(title="申请单号", field="applyCode"),
ExportColumn(title="申请时间", field="applyTime"),
ExportColumn(title="申请人", field="applicantName"),
ExportColumn(title="报销主题", field="title"),
ExportColumn(title="费用科目", field="expenseName"),
ExportColumn(title="金额(元)", field="amount"),
ExportColumn(title="状态", field="status"),
ExportColumn(title="当前节点", field="currentNode"),
]
def _reimburse_list_filters(body: BxApplyListExportBody, db: Session, tenant_no: str) -> list:
filters = []
if body.status:
filters.append(BxReimburseApply.status == body.status)
if body.keyword:
filters.append(
or_(
BxReimburseApply.apply_code.contains(body.keyword),
BxReimburseApply.applicant_name.contains(body.keyword),
BxReimburseApply.title.contains(body.keyword),
)
)
if body.expense_id:
filters.append(BxReimburseApply.expense_id == str(body.expense_id).strip())
expense_filter = ReimburseService.build_expense_name_condition(db, tenant_no, body.expense_name)
if expense_filter is not None:
filters.append(expense_filter)
if body.applicant_id:
filters.append(BxReimburseApply.applicant_id == str(body.applicant_id).strip())
if body.ids:
filters.append(BxReimburseApply.id.in_([str(i) for i in body.ids]))
append_create_time_filters(
filters,
BxReimburseApply,
apply_date=body.apply_date,
apply_date_from=body.apply_date_from,
apply_date_to=body.apply_date_to,
)
return filters
def _export_reimburse_rows(db: Session, tenant_no: str, rows) -> list:
out_rows = ReimburseService.out_rows_with_attachment_counts(db, tenant_no, list(rows))
return [dump_export_row(r) for r in out_rows]
def _build_details_data(
db: Session,
tenant_no: str,
@@ -327,6 +383,139 @@ def approved_by_me(
return ApiResponse(data=PagedData(rows=out_rows, total=total, page=page, page_size=pageSize))
@router.post("/export")
def export_reimburses(
body: BxApplyListExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
filters = _reimburse_list_filters(body, db, tenant_no)
rows, _ = ReimburseService.get_paged(
db, tenant_no, page=1, page_size=EXPORT_MAX_ROWS, filters=filters, user=user
)
return respond_xlsx(
db,
tenant_no=tenant_no,
sheet_title="报销申请",
columns=REIMBURSE_EXPORT_COLUMNS,
rows=_export_reimburse_rows(db, tenant_no, rows),
filename_stem="报销申请",
requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.post("/my/export")
def export_my_reimburses(
body: BxApplyListExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
filters = [
or_(
BxReimburseApply.applicant_id == user.id,
BxReimburseApply.create_by == user.id,
)
]
filters.extend(_reimburse_list_filters(body, db, tenant_no))
rows, _ = ReimburseService.get_paged(
db, tenant_no, page=1, page_size=EXPORT_MAX_ROWS, filters=filters, user=user
)
return respond_xlsx(
db,
tenant_no=tenant_no,
sheet_title="我的报销",
columns=REIMBURSE_EXPORT_COLUMNS,
rows=_export_reimburse_rows(db, tenant_no, rows),
filename_stem="我的报销申请",
requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.post("/pending-approval/export")
def export_pending_approval_reimburses(
body: BxApplyListExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
applicant_id = str(body.applicant_id).strip() if body.applicant_id else None
rows, _ = ReimburseService.pending_approval(
db,
user,
tenant_no,
page=1,
page_size=EXPORT_MAX_ROWS,
keyword=body.keyword or "",
applicant_id=applicant_id,
expense_name=body.expense_name,
apply_date=body.apply_date,
apply_date_from=body.apply_date_from,
apply_date_to=body.apply_date_to,
)
if body.ids:
id_set = {str(i) for i in body.ids}
rows = [r for r in rows if str(r.id) in id_set]
return respond_xlsx(
db,
tenant_no=tenant_no,
sheet_title="报销待审批",
columns=REIMBURSE_EXPORT_COLUMNS,
rows=_export_reimburse_rows(db, tenant_no, rows),
filename_stem="报销待审批",
requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.post("/approved-by-me/export")
def export_approved_by_me_reimburses(
body: BxApplyListExportBody,
db: Session = Depends(get_db),
user: BxUserContext = Depends(get_bx_current_user),
):
try:
tenant_no = _tenant(db, user)
applicant_id = str(body.applicant_id).strip() if body.applicant_id else None
rows, _ = ReimburseService.approved_by_me(
db,
user,
tenant_no,
page=1,
page_size=EXPORT_MAX_ROWS,
keyword=body.keyword or "",
applicant_id=applicant_id,
expense_name=body.expense_name,
apply_date=body.apply_date,
apply_date_from=body.apply_date_from,
apply_date_to=body.apply_date_to,
)
if body.ids:
id_set = {str(i) for i in body.ids}
rows = [r for r in rows if str(r.id) in id_set]
return respond_xlsx(
db,
tenant_no=tenant_no,
sheet_title="报销已审批",
columns=REIMBURSE_EXPORT_COLUMNS,
rows=_export_reimburse_rows(db, tenant_no, rows),
filename_stem="报销已审批",
requested_columns=body.columns,
)
except ExportValidationError as e:
raise HTTPException(status_code=400, detail=str(e)) from e
@router.get("/{reimburse_id}", response_model=ApiResponse[ReimburseApplyOut])
def get_reimburse(
reimburse_id: str,