22a2872100
- calc_receipt 双模式：recalc_reason 非 None=重算（audit action=重算/ reason 留痕、作废旧版本行、calc_version 自动递增、CAS 仅首算执行—— 重算状态本就是已核算，误跑 CAS 会误报并发撞车） - recalc_receipt 薄委托（reason 必填、未核算过 400）；重算授权 require_roles(admin, finance)，营销后勤不可重算 - batch_calc：逐笔独立事务不开外层 audit（嵌套禁令），逐笔成败清单 （同业务第二笔回款走 #25 重复分支 ok=True/repeated=True） - 测试 +5：重算版本对/原因缺失 400/未核算重算 400/越权 403/批量清单 - 修 next_version 空表 max NULL → int(None) TypeError Co-Authored-By: Claude Code <noreply@anthropic.com>
115 lines
4.0 KiB
Python
115 lines
4.0 KiB
Python
"""绩效核算台账仓储：只读写数据并 flush；commit/rollback 在服务层。"""
|
||
|
||
from sqlalchemy import func, select
|
||
from sqlalchemy.orm import Session
|
||
|
||
from app.models import PerformanceLedger
|
||
from app.schemas.calc import LedgerQuery
|
||
|
||
|
||
def get_by_id(session: Session, ledger_id: int) -> PerformanceLedger | None:
|
||
"""按主键取台账行。"""
|
||
return session.get(PerformanceLedger, ledger_id)
|
||
|
||
|
||
def get_active_by_receipt(
|
||
session: Session, receipt_id: int, *, calc_type: int = 1
|
||
) -> PerformanceLedger | None:
|
||
"""取某回款的当前生效核算行（is_active=1；无则 None）。"""
|
||
return session.execute(
|
||
select(PerformanceLedger).where(
|
||
PerformanceLedger.receipt_id == receipt_id,
|
||
PerformanceLedger.calc_type == calc_type,
|
||
PerformanceLedger.is_active == 1,
|
||
)
|
||
).scalar_one_or_none()
|
||
|
||
|
||
def has_active_for_business(session: Session, business_id: int, *, calc_type: int = 1) -> bool:
|
||
"""该业务是否已有生效核算行（核算粒度 #25：业务级一次性计提的判定）。"""
|
||
return (
|
||
session.execute(
|
||
select(func.count())
|
||
.select_from(PerformanceLedger)
|
||
.where(
|
||
PerformanceLedger.business_id == business_id,
|
||
PerformanceLedger.calc_type == calc_type,
|
||
PerformanceLedger.is_active == 1,
|
||
)
|
||
).scalar_one()
|
||
> 0
|
||
)
|
||
|
||
|
||
def get_active_by_receipt_of_business(
|
||
session: Session, business_id: int, *, calc_type: int = 1
|
||
) -> PerformanceLedger:
|
||
"""取该业务当前生效的核算行（重复回款登记进度时回显既有台账）。"""
|
||
return (
|
||
session.execute(
|
||
select(PerformanceLedger)
|
||
.where(
|
||
PerformanceLedger.business_id == business_id,
|
||
PerformanceLedger.calc_type == calc_type,
|
||
PerformanceLedger.is_active == 1,
|
||
)
|
||
.order_by(PerformanceLedger.id.desc())
|
||
)
|
||
.scalars()
|
||
.first()
|
||
)
|
||
|
||
|
||
def add(session: Session, row: PerformanceLedger) -> PerformanceLedger:
|
||
"""落台账行（flush 取 id；commit 在服务层）。"""
|
||
session.add(row)
|
||
session.flush()
|
||
return row
|
||
|
||
|
||
def mark_inactive(session: Session, row: PerformanceLedger) -> None:
|
||
"""重算时把旧版本行翻为已替代（全表唯一的受控 UPDATE 例外；不 commit）。"""
|
||
row.is_active = 0
|
||
session.flush()
|
||
|
||
|
||
def next_version(session: Session, receipt_id: int) -> int:
|
||
"""某回款的下一个核算版本号（max+1；无行时 1）。"""
|
||
current = session.execute(
|
||
select(func.max(PerformanceLedger.calc_version)).where(
|
||
PerformanceLedger.receipt_id == receipt_id
|
||
)
|
||
).scalar_one()
|
||
return int(current or 0) + 1
|
||
|
||
|
||
def list_ledger(session: Session, query: LedgerQuery) -> list[PerformanceLedger]:
|
||
"""分页查询台账（筛选：月/人员/业务/生效/类型）。"""
|
||
stmt = select(PerformanceLedger).where(*_filters(query))
|
||
stmt = stmt.order_by(PerformanceLedger.id.desc()).offset(query.offset).limit(query.page_size)
|
||
return list(session.execute(stmt).scalars())
|
||
|
||
|
||
def count_ledger(session: Session, query: LedgerQuery) -> int:
|
||
"""台账计数（与 list_ledger 同筛选）。"""
|
||
return int(
|
||
session.execute(
|
||
select(func.count()).select_from(PerformanceLedger).where(*_filters(query))
|
||
).scalar_one()
|
||
)
|
||
|
||
|
||
def _filters(query: LedgerQuery) -> tuple:
|
||
filters = []
|
||
if query.settlement_month:
|
||
filters.append(PerformanceLedger.settlement_month == query.settlement_month)
|
||
if query.personnel_id is not None:
|
||
filters.append(PerformanceLedger.personnel_id == query.personnel_id)
|
||
if query.business_id is not None:
|
||
filters.append(PerformanceLedger.business_id == query.business_id)
|
||
if query.is_active is not None:
|
||
filters.append(PerformanceLedger.is_active == query.is_active)
|
||
if query.calc_type is not None:
|
||
filters.append(PerformanceLedger.calc_type == query.calc_type)
|
||
return tuple(filters)
|