refactor(后端): 将工资与工作区业务逻辑下沉服务层

将月份状态、资料输出、调整单编排及工作区查询、 CSV 生成移至现有服务层，路由仅绑定参数并返回响应。保持接口路径、参数、响应模型和权限依赖一致，补充九项内存库行为回归并同步测试记录。
2026-11-02 09:42:55 +08:00
1 parent 019817d6dc
commit 71b7846a79
@@ -18,39 +18,12 @@ def month_state(
    session: DbSession,
    _: LoginUser,
 ):
-    from sqlalchemy import select
-
-    from app.core.month import validate_month
-    from app.models import MonthlySettlement, PayrollMonth
-
-    validate_month(month)
-    control = session.scalar(select(PayrollMonth).where(PayrollMonth.month == month))
-    existing = session.scalar(
-        select(MonthlySettlement.id).where(MonthlySettlement.settlement_month == month)
-    )
-    return ok(
-        {
-            "month": month,
-            "allocation_locked": bool(existing or (control and control.generated_at)),
-            "maker_name": control.maker_name if control else None,
-        }
-    )
+    return ok(payroll_months.month_state(session, month))


@router.get("/businesses/{business_id}/input")
 def input_detail(business_id: int, session: DbSession, _: LoginUser):
-    record = payroll_calculation.latest_input(session, business_id)
-    return ok(
-        None
-        if record is None
-        else {
-            "id": record.id,
-            "version": record.version,
-            "source": record.source_database,
-            "fingerprint": record.fingerprint,
-            "data": record.data_json,
-        }
-    )
+    return ok(payroll_inputs.detail(session, business_id))


@router.post("/businesses/{business_id}/input")
@@ -90,19 +63,6 @@ def allocations(
 def adjustment(
    payload: AllocationAdjustmentIn, session: DbSession, actor: PayrollWriter, meta: RequestMetaDep
 ):
-    from app.core.exceptions import BadRequestError
-    from app.models import PerformanceLedger
-    from app.schemas.settlement import AdjustmentCreateIn
-
-    old = session.get(PerformanceLedger, payload.ledger_id)
-    if old is None or old.settlement_id is None:
-        raise BadRequestError("请选择已生成工资的原台账")
-    data = AdjustmentCreateIn(
-        settlement_month=payroll_months.current_month(),
-        personnel_id=payload.personnel_id,
-        direction=payload.direction,
-        amount=payload.amount,
-        reason=payload.reason,
-        source_ledger_id=old.id,
+    return ok(
+        settlement_service.create_allocation_adjustment(session, payload, operator=actor, meta=meta)
    )
-    return ok(settlement_service.create_adjustment(session, data, operator=actor, meta=meta))
@@ -3,17 +3,12 @@
 from typing import Annotated

 from fastapi import APIRouter, Path, Query
-from sqlalchemy import func, select
 from starlette.responses import StreamingResponse

 from app.api.deps import DbSession, PayrollWriter, WorkbenchReader
 from app.core.response import ApiResponse, PageQuery, PageResult, ok
-from app.models import TPlusSyncRecord, TPlusWorkLine
 from app.schemas.tplus_workbench import FactIn, SourceChoiceQuery, WorkCreateIn, WorkQuery
 from app.services.tplus import workbench
-from app.services.tplus.report_labels import ACTION_LABELS, reason_label, spreadsheet_value
-from app.services.tplus.snapshots import source_statement
-from app.services.tplus.task_service import _source_database

 router = APIRouter()
 RunNo = Annotated[str, Path(pattern=r"^[A-Za-z0-9_-]+$", max_length=32)]
@@ -36,33 +31,7 @@ def fact_history(
    session: DbSession, _: WorkbenchReader, fact_id: int, query: Annotated[PageQuery, Query()]
 ):
    """按事实身份分页查看修改历史，不允许跨账套读取。"""
-    from app.core.exceptions import NotFoundError
-    from app.models import TPlusFact
-
-    fact = session.get(TPlusFact, fact_id)
-    if fact is None or fact.source_database != _source_database():
-        raise NotFoundError("补充资料不存在")
-    conditions = [
-        TPlusFact.source_database == fact.source_database,
-        TPlusFact.kind == fact.kind,
-        TPlusFact.fact_key == fact.fact_key,
-    ]
-    total = session.scalar(select(func.count()).select_from(TPlusFact).where(*conditions))
-    rows = session.scalars(
-        select(TPlusFact)
-        .where(*conditions)
-        .order_by(TPlusFact.version.desc())
-        .offset(query.offset)
-        .limit(query.page_size)
-    )
-    return ok(
-        PageResult(
-            records=[workbench.fact_out(f) for f in rows],
-            total=total or 0,
-            page_num=query.page_num,
-            page_size=query.page_size,
-        )
-    )
+    return ok(workbench.fact_history(session, fact_id, query))


@router.post("/work-runs", response_model=ApiResponse[dict])
@@ -98,126 +67,14 @@ def source_choices(
    query: Annotated[SourceChoiceQuery, Query()],
 ):
    """仅提供挑选资料所需的源编号和名称，不返回电话、地址和原始载荷。"""
-    from app.core.exceptions import BadRequestError
-
-    try:
-        statement = source_statement(session, _source_database(), query.entity)
-    except workbench.WorkbenchError:
-        raise BadRequestError("请先完整读取相关源数据") from None
-    if query.search:
-        escaped = query.search.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
-        statement = statement.where(TPlusSyncRecord.source_no.like(f"%{escaped}%", escape="\\"))
-    total = session.scalar(select(func.count()).select_from(statement.subquery()))
-    rows = session.scalars(
-        statement.order_by(TPlusSyncRecord.source_id).offset(query.offset).limit(query.page_size)
-    )
-    records = [
-        {
-            "source_id": r.source_id,
-            "source_no": r.source_no,
-            "name": str(r.payload_json.get("name") or ""),
-            "parent_id": str(r.payload_json.get("source_parent_id") or ""),
-            "date": str(
-                r.payload_json.get("voucherdate") or r.payload_json.get("voucherDate") or ""
-            )[:10],
-        }
-        for r in rows
-    ]
-    return ok(
-        PageResult(
-            records=records, total=total or 0, page_num=query.page_num, page_size=query.page_size
-        )
-    )
+    return ok(workbench.source_choices(session, query))


@router.get("/work-runs/{run_no}/report")
 def work_report(session: DbSession, _: WorkbenchReader, run_no: RunNo):
    """导出全部预演明细，防止源单号被电子表格当作公式执行。"""
-    import csv
-    import io
-
-    workbench.get_run(session, run_no)
-
-    def rows():
-        buffer = io.StringIO()
-        writer = csv.writer(buffer)
-        yield "\ufeff"
-        writer.writerow(
-            [
-                "运行编号",
-                "行号",
-                "类型",
-                "源ID或平账组",
-                "处理结果",
-                "源编号",
-                "名称",
-                "回款单号",
-                "关联凭证示例",
-                "发货单号",
-                "匹配金额",
-                "分配后该明细剩余应收",
-                "回款天数",
-                "指导成本分摊",
-                "折算利润",
-                "利润门槛（百分数）",
-                "计提比例",
-                "计提金额",
-                "归属工号",
-                "原因",
-                "说明",
-            ]
-        )
-        yield buffer.getvalue()
-        buffer.seek(0)
-        buffer.truncate(0)
-        statement = (
-            select(TPlusWorkLine)
-            .where(TPlusWorkLine.run_no == run_no)
-            .order_by(TPlusWorkLine.line_no)
-        )
-        for row in session.scalars(statement).yield_per(200):
-            data = row.data_json
-            values = data.get("values") or {}
-            fields = [
-                run_no,
-                row.line_no,
-                row.entity_type,
-                row.source_id,
-                ACTION_LABELS.get(row.action, row.action),
-                data.get("source_no", ""),
-                values.get("personnel_name")
-                or values.get("product_name")
-                or values.get("company_name")
-                or data.get("source_name")
-                or "",
-                *[
-                    data.get(k, "")
-                    for k in (
-                        "receipt_no",
-                        "accounting_voucher_code",
-                        "shipment_no",
-                        "amount",
-                        "shipment_remaining_after",
-                        "days",
-                        "allocated_cost",
-                        "converted_profit",
-                        "profit_threshold",
-                        "rate_percent",
-                        "performance",
-                        "personnel_id",
-                    )
-                ],
-                reason_label(row.reason)
-                or ("经理本人业务，已排除绩效汇总" if data.get("excluded_manager_own") else ""),
-                "仅供核对，未写入正式工资",
-            ]
-            writer.writerow([spreadsheet_value(v) for v in fields])
-            yield buffer.getvalue()
-            buffer.seek(0)
-            buffer.truncate(0)
-
    return StreamingResponse(
-        rows(),
+        workbench.report_csv(session, run_no),
        media_type="text/csv; charset=utf-8",
        headers={"Content-Disposition": f'attachment; filename="{run_no}-preview.csv"'},
    )
@@ -22,6 +22,20 @@ from app.services.payroll_calculation import latest_input
 from app.services.tplus.workbench import digest


+def detail(session, business_id):
+    """返回最新核算资料；未准备资料的业务保持空结果。"""
+    record = latest_input(session, business_id)
+    if record is None:
+        return None
+    return {
+        "id": record.id,
+        "version": record.version,
+        "source": record.source_database,
+        "fingerprint": record.fingerprint,
+        "data": record.data_json,
+    }
+
+
 def setup(session, business_id, payload, operator, meta=None):
    with audit_service.audit(
        session,
@@ -15,6 +15,20 @@ def current_month() -> str:
    return datetime.now(timezone(timedelta(hours=8))).strftime("%Y-%m")


+def month_state(session, month):
+    """查询生成锁及制作人，兼容升级前已存在的月结记录。"""
+    validate_month(month)
+    control = session.scalar(select(PayrollMonth).where(PayrollMonth.month == month))
+    existing = session.scalar(
+        select(MonthlySettlement.id).where(MonthlySettlement.settlement_month == month)
+    )
+    return {
+        "month": month,
+        "allocation_locked": bool(existing or (control and control.generated_at)),
+        "maker_name": control.maker_name if control else None,
+    }
+
+
 def lock_month(session, month, operator):
    """INSERT 的唯一键串行化首次建行，避免两个请求同时认为月份不存在。"""
    ensure_payroll_writer(operator)
@@ -534,6 +534,26 @@ def _detail_of(session: Session, settlement: MonthlySettlement) -> SettlementDet
    return detail


+def create_allocation_adjustment(session, payload, *, operator, meta=None):
+    """校验已生成工资的原台账，并将分配差额转换为当月调整单。"""
+    from app.models import PerformanceLedger
+    from app.schemas.settlement import AdjustmentCreateIn
+    from app.services import payroll_months
+
+    old = session.get(PerformanceLedger, payload.ledger_id)
+    if old is None or old.settlement_id is None:
+        raise BadRequestError("请选择已生成工资的原台账")
+    data = AdjustmentCreateIn(
+        settlement_month=payroll_months.current_month(),
+        personnel_id=payload.personnel_id,
+        direction=payload.direction,
+        amount=payload.amount,
+        reason=payload.reason,
+        source_ledger_id=old.id,
+    )
+    return create_adjustment(session, data, operator=operator, meta=meta)
+
+
 def create_adjustment(
    session: Session,
    payload,
@@ -12,8 +12,9 @@ from sqlalchemy.orm import defer
 from app.core.exceptions import BadRequestError, NotFoundError
 from app.core.response import PageResult
 from app.core.tplus_lock import TPlusBusyError, sync_lock
-from app.models import TPlusFact, TPlusWorkLine, TPlusWorkRun
+from app.models import TPlusFact, TPlusSyncRecord, TPlusWorkLine, TPlusWorkRun
 from app.schemas.tplus_workbench import WorkCreateIn
+from app.services.tplus.report_labels import ACTION_LABELS, reason_label, spreadsheet_value
 from app.services.tplus.task_service import _source_database, new_batch_no

 RULE_VERSION = "2026-10-30.2"
@@ -244,6 +245,152 @@ def list_lines(session, number, query):
    )


+def fact_history(session, fact_id, query):
+    """按事实身份分页查看修改历史，不允许跨账套读取。"""
+    fact = session.get(TPlusFact, fact_id)
+    if fact is None or fact.source_database != _source_database():
+        raise NotFoundError("补充资料不存在")
+    conditions = [
+        TPlusFact.source_database == fact.source_database,
+        TPlusFact.kind == fact.kind,
+        TPlusFact.fact_key == fact.fact_key,
+    ]
+    total = session.scalar(select(func.count()).select_from(TPlusFact).where(*conditions))
+    rows = session.scalars(
+        select(TPlusFact)
+        .where(*conditions)
+        .order_by(TPlusFact.version.desc())
+        .offset(query.offset)
+        .limit(query.page_size)
+    )
+    return PageResult(
+        records=[fact_out(f) for f in rows],
+        total=total or 0,
+        page_num=query.page_num,
+        page_size=query.page_size,
+    )
+
+
+def source_choices(session, query):
+    """仅提供挑选资料所需的源编号和名称，不返回电话、地址和原始载荷。"""
+    from app.services.tplus.snapshots import source_statement
+
+    try:
+        statement = source_statement(session, _source_database(), query.entity)
+    except WorkbenchError:
+        raise BadRequestError("请先完整读取相关源数据") from None
+    if query.search:
+        escaped = query.search.replace("\\", "\\\\").replace("%", "\\%").replace("_", "\\_")
+        statement = statement.where(TPlusSyncRecord.source_no.like(f"%{escaped}%", escape="\\"))
+    total = session.scalar(select(func.count()).select_from(statement.subquery()))
+    rows = session.scalars(
+        statement.order_by(TPlusSyncRecord.source_id).offset(query.offset).limit(query.page_size)
+    )
+    records = [
+        {
+            "source_id": r.source_id,
+            "source_no": r.source_no,
+            "name": str(r.payload_json.get("name") or ""),
+            "parent_id": str(r.payload_json.get("source_parent_id") or ""),
+            "date": str(
+                r.payload_json.get("voucherdate") or r.payload_json.get("voucherDate") or ""
+            )[:10],
+        }
+        for r in rows
+    ]
+    return PageResult(
+        records=records, total=total or 0, page_num=query.page_num, page_size=query.page_size
+    )
+
+
+def report_csv(session, run_no):
+    """导出全部预演明细，防止源单号被电子表格当作公式执行。"""
+    import csv
+    import io
+
+    get_run(session, run_no)
+
+    def rows():
+        buffer = io.StringIO()
+        writer = csv.writer(buffer)
+        yield "\ufeff"
+        writer.writerow(
+            [
+                "运行编号",
+                "行号",
+                "类型",
+                "源ID或平账组",
+                "处理结果",
+                "源编号",
+                "名称",
+                "回款单号",
+                "关联凭证示例",
+                "发货单号",
+                "匹配金额",
+                "分配后该明细剩余应收",
+                "回款天数",
+                "指导成本分摊",
+                "折算利润",
+                "利润门槛（百分数）",
+                "计提比例",
+                "计提金额",
+                "归属工号",
+                "原因",
+                "说明",
+            ]
+        )
+        yield buffer.getvalue()
+        buffer.seek(0)
+        buffer.truncate(0)
+        statement = (
+            select(TPlusWorkLine)
+            .where(TPlusWorkLine.run_no == run_no)
+            .order_by(TPlusWorkLine.line_no)
+        )
+        for row in session.scalars(statement).yield_per(200):
+            data = row.data_json
+            values = data.get("values") or {}
+            fields = [
+                run_no,
+                row.line_no,
+                row.entity_type,
+                row.source_id,
+                ACTION_LABELS.get(row.action, row.action),
+                data.get("source_no", ""),
+                values.get("personnel_name")
+                or values.get("product_name")
+                or values.get("company_name")
+                or data.get("source_name")
+                or "",
+                *[
+                    data.get(k, "")
+                    for k in (
+                        "receipt_no",
+                        "accounting_voucher_code",
+                        "shipment_no",
+                        "amount",
+                        "shipment_remaining_after",
+                        "days",
+                        "allocated_cost",
+                        "converted_profit",
+                        "profit_threshold",
+                        "rate_percent",
+                        "performance",
+                        "personnel_id",
+                    )
+                ],
+                reason_label(row.reason)
+                or ("经理本人业务，已排除绩效汇总" if data.get("excluded_manager_own") else ""),
+                "仅供核对，未写入正式工资",
+            ]
+            writer.writerow([spreadsheet_value(v) for v in fields])
+            yield buffer.getvalue()
+            buffer.seek(0)
+            buffer.truncate(0)
+
+    return rows()
+
+
 def execute_next(session):
    """调用方持有原有全局锁；中断任务保留明细，禁止不明状态自动应用。"""
    for old in session.scalars(select(TPlusWorkRun).where(TPlusWorkRun.status == "RUNNING")):