feat(report): 报表统计四表查询与 Excel 签字导出
- 四表接口 /api/v1/reports/*：个人明细（全筛选 summary）、部门汇总（团队基数与月结聚合同源、12.5%/5% 分列、零行经理、冻结对照）、业务统计（排除聚合行）、回款统计（8 档区间恒在、回款金额按 receipt_id 去重防分摊拆行翻倍） - Excel 导出：公司页眉/财务复核栏/领导签字栏/日期/版本、Decimal 原值 + number_format、文本防公式注入、2 万行超限 400、导出行为入操作日志 - manager_share 共享模块：月结聚合与报表部门汇总同源取参与分桶（薄委托保留测试入口） - 区间元数据落 core/report_meta（repository 需要类型，避免反向依赖 service 层） - 准入 require_roles(admin/finance/leader)，支持自定义 403 文案 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
liuwenxinandClaude Code committed
1 parent
cfd2a196f2
commit
2a1939d2e7
11 files changed
+1435
-129
No files matched your search
@@ -9,11 +9,8 @@
|
||||
"""
|
||||
|
||||
import logging
|
||||
from calendar import monthrange
|
||||
from dataclasses import dataclass
|
||||
from datetime import date
|
||||
from decimal import ROUND_HALF_UP, Decimal
|
||||
from fractions import Fraction
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.orm import Session
|
||||
@@ -45,7 +42,7 @@ from app.schemas.settlement import (
|
||||
SettlementOut,
|
||||
SettlementQuery,
|
||||
)
|
||||
from app.services import approval_service, audit_service
|
||||
from app.services import approval_service, audit_service, manager_share
|
||||
from app.services.approval_service import AuditRecord, RequestMeta
|
||||
from app.services.formula import manager_team_share, monthly_salary
|
||||
|
||||
@@ -352,82 +349,28 @@ def _confirm_scope(session: Session, month: str) -> list:
|
||||
)
|
||||
|
||||
|
||||
@dataclass(frozen=True, slots=True)
|
||||
class _ShareParams:
|
||||
"""经理分成取参与参数原文（同一次生成共用一份，随月月末时点化）。"""
|
||||
def _manager_share_params(session: Session, month: str) -> manager_share.ManagerShareParams:
|
||||
"""薄委托 manager_share 共享模块：月结聚合与报表部门汇总同源取参。
|
||||
|
||||
month: str
|
||||
param_date: date
|
||||
team_text: str
|
||||
company_text: str
|
||||
team_pct: Fraction
|
||||
company_pct: Fraction
|
||||
include_manager_personal: bool
|
||||
|
||||
|
||||
def _manager_share_params(session: Session, month: str) -> _ShareParams:
|
||||
"""解析经理分成参数（锚定所属月月末，取参与台账行口径同源）。
|
||||
|
||||
参数按百分数存储（12.5 表示 12.5%）：parse_fraction 得 12.5，
|
||||
manager_team_share 内部再 ÷100 —— 调用方不得再乘 100（否则放大 100 倍）。
|
||||
#12 开关（manager.personal.included）与分成比例同日取参，答复后调整可追溯。
|
||||
迁移说明（2026-10-19）：实现原样迁至 manager_share，行为零变化；
|
||||
参数按百分数存储（12.5 表示 12.5%），调用方不得再乘 100。
|
||||
"""
|
||||
from app.services.param_service import parse_fraction, resolve_snapshot
|
||||
|
||||
param_date = _month_end(month)
|
||||
snapshot = resolve_snapshot(session, param_date)
|
||||
team_text = snapshot.get("manager.share.team")
|
||||
company_text = snapshot.get("manager.share.company")
|
||||
return _ShareParams(
|
||||
month=month,
|
||||
param_date=param_date,
|
||||
team_text=team_text,
|
||||
company_text=company_text,
|
||||
team_pct=parse_fraction(team_text),
|
||||
company_pct=parse_fraction(company_text),
|
||||
include_manager_personal=snapshot.get("manager.personal.included") == "1",
|
||||
)
|
||||
|
||||
|
||||
def _add_team_performance(managers: dict[int, dict], manager_id: int, row) -> None:
|
||||
"""把一行业绩并入经理的团队桶（首行固化业务锚点，成员名去重收集）。"""
|
||||
bucket = managers.setdefault(
|
||||
manager_id,
|
||||
{
|
||||
"performance": Decimal("0"),
|
||||
"business_id": row.business_id,
|
||||
"business_no": row.business_no,
|
||||
"names": set(),
|
||||
},
|
||||
)
|
||||
bucket["performance"] += row.performance_amount or Decimal("0")
|
||||
bucket["names"].add(row.personnel_name)
|
||||
return manager_share.manager_share_params(session, month)
|
||||
|
||||
|
||||
def _collect_team_buckets(
|
||||
session: Session, ledger_rows: list, include_manager_personal: bool
|
||||
) -> dict[int, dict]:
|
||||
"""按经理采集团队业绩。
|
||||
|
||||
业务员行经 manager_id 上溯到其经理；经理个人户行（#12 开关计入时）
|
||||
归属经理本人——行 personnel_id 即经理，不走上溯（经理没有上级，
|
||||
按上溯会被跳过漏计）。
|
||||
"""
|
||||
managers: dict[int, dict] = {}
|
||||
for row in ledger_rows:
|
||||
if row.customer_type == "manager_personal":
|
||||
if include_manager_personal:
|
||||
_add_team_performance(managers, row.personnel_id, row)
|
||||
continue # 默认不计入聚合基数（#12 参数化）
|
||||
person = session.get(Personnel, row.personnel_id)
|
||||
manager_id = person.manager_id if person else None
|
||||
if manager_id is not None:
|
||||
_add_team_performance(managers, manager_id, row)
|
||||
return managers
|
||||
"""薄委托 manager_share 共享模块：按经理采集团队业绩（行为零变化）。"""
|
||||
return manager_share.collect_team_buckets(session, ledger_rows, include_manager_personal)
|
||||
|
||||
|
||||
def _aggregate_row(
|
||||
session: Session, manager, bucket: dict, company_base: Decimal, share: _ShareParams
|
||||
session: Session,
|
||||
manager,
|
||||
bucket: dict,
|
||||
company_base: Decimal,
|
||||
share: manager_share.ManagerShareParams,
|
||||
):
|
||||
"""单经理聚合台账行（必须落库：月结 ledger_ids 与报表下钻的锚点）。"""
|
||||
from app.models import PerformanceLedger
|
||||
@@ -487,16 +430,8 @@ def _build_manager_aggregates(session: Session, ledger_rows: list, month: str) -
|
||||
|
||||
share = _manager_share_params(session, month)
|
||||
managers = _collect_team_buckets(session, ledger_rows, share.include_manager_personal)
|
||||
# 全公司基数：默认排除经理个人户行（#12 开关计入时不过滤）；
|
||||
# 口径逐行固定，循环外算一次
|
||||
company_base = sum(
|
||||
(
|
||||
r.performance_amount or Decimal("0")
|
||||
for r in ledger_rows
|
||||
if share.include_manager_personal or r.customer_type != "manager_personal"
|
||||
),
|
||||
Decimal("0"),
|
||||
)
|
||||
# 全公司基数：默认排除经理个人户行（#12 开关计入时不过滤）；共享口径单点
|
||||
company_base = manager_share.company_base_of(ledger_rows, share.include_manager_personal)
|
||||
aggregates: list = []
|
||||
for manager_id, bucket in managers.items():
|
||||
manager = session.get(Personnel, manager_id)
|
||||
@@ -514,15 +449,12 @@ def _build_manager_aggregates(session: Session, ledger_rows: list, month: str) -
|
||||
|
||||
|
||||
def _month_end(month: str) -> date:
|
||||
"""YYYY-MM → 所属月月末（月结取参锚点）。
|
||||
"""薄委托 manager_share 共享模块：YYYY-MM → 所属月月末（取参锚点）。
|
||||
|
||||
月结是对过去某月的金额计算，取参必须锚定业务月份——按 date.today()
|
||||
会让补生成历史月份的结果随操作日期漂移（违背「参数按生效日期时点化」
|
||||
红线）。单笔台账行按回款日取参（裁决 #11）；聚合与月工资口径没有
|
||||
更细的业务日期，取该月最后可确定的生效时点。
|
||||
保留包装：tests/unit/test_settlement_helpers.py 直接 import 本名字；
|
||||
「补生成历史月份结果不随操作日漂移」的原因说明见 manager_share.month_end。
|
||||
"""
|
||||
year, mon = int(month[:4]), int(month[5:7])
|
||||
return date(year, mon, monthrange(year, mon)[1])
|
||||
return manager_share.month_end(month)
|
||||
|
||||
|
||||
def _salary_mode_of(session: Session, role_code: str, month: str) -> str | None:
|
||||
|
||||
Reference in new issue
Block a user