feat: 设备模具统计按归属日期汇总

app/routers/usage_stats.py

@@ -7,7 +7,14 @@ from sqlalchemy.orm import Session, selectinload
 
 from app.database import get_db
 from app.deps import require_roles
-from app.models import Equipment, Personnel, ProductionReport, ReportStatus, Role
+from app.models import (
+    Equipment,
+    Personnel,
+    ProductionReport,
+    ProductionReportAllocation,
+    ReportStatus,
+    Role,
+)
 from app.schemas import (
     PageResponse,
     UsageStatsDailyRow,
@@ -18,7 +25,7 @@ from app.schemas import (
 from app.services.attendance_points import accessible_point_names, require_attendance_point_access
 from app.services.common import round2
 from app.services.report_lifecycle import purge_expired_voided_reports
-from app.services.usage_stats import UsageStatRow, build_usage_stats
+from app.services.usage_stats import UsageStatRow, build_usage_stats_from_allocations
 from app.services.usage_stats_export import export_usage_stats_rows
 
 router = APIRouter(prefix="/api/usage-stats", tags=["usage-stats"])
@@ -47,10 +54,19 @@ def _equipment_type_map(db: Session, point_names: list[str]) -> dict[tuple[str,
     return {(_clean(row.attendance_point_name), _clean(row.device_no)): row.device_type for row in rows}
 
 
-def _approved_reports_query(point_names: list[str], start_date: date | None, end_date: date | None):
+def _approved_allocations_query(
+    point_names: list[str],
+    start_date: date | None,
+    end_date: date | None,
+):
     query = (
-        select(ProductionReport)
-        .options(selectinload(ProductionReport.employee), selectinload(ProductionReport.items))
+        select(ProductionReportAllocation)
+        .join(ProductionReportAllocation.report)
+        .join(ProductionReportAllocation.item)
+        .options(
+            selectinload(ProductionReportAllocation.report).selectinload(ProductionReport.employee),
+            selectinload(ProductionReportAllocation.item),
+        )
         .where(
             ProductionReport.status == ReportStatus.approved,
             ProductionReport.is_voided.is_(False),
@@ -58,10 +74,14 @@ def _approved_reports_query(point_names: list[str], start_date: date | None, end
         )
     )
     if start_date:
-        query = query.where(ProductionReport.report_date >= start_date)
+        query = query.where(ProductionReportAllocation.allocation_date >= start_date)
     if end_date:
-        query = query.where(ProductionReport.report_date <= end_date)
-    return query.order_by(ProductionReport.report_date.desc(), ProductionReport.id.desc())
+        query = query.where(ProductionReportAllocation.allocation_date <= end_date)
+    return query.order_by(
+        ProductionReportAllocation.allocation_date.desc(),
+        ProductionReportAllocation.report_id.desc(),
+        ProductionReportAllocation.id.desc(),
+    )
 
 
 def _sort_usage_rows(rows: list[UsageStatRow], sort_by: str) -> list[UsageStatRow]:
@@ -174,6 +194,93 @@ def _build_usage_stats_export_response(device_rows: list[UsageStatRow], mold_row
     )
 
 
+def _build_usage_stats_detail_from_allocations(
+    *,
+    allocations: list,
+    category: str,
+    target_args: dict,
+    equipment_type_by_key: dict[tuple[str, str], str],
+) -> UsageStatsDetailOut:
+    rows = build_usage_stats_from_allocations(
+        allocations=allocations,
+        category=category,
+        equipment_type_by_key=equipment_type_by_key,
+    )
+    target = next((row for row in rows if _matches_target(row, **target_args)), None)
+    if target is None:
+        return UsageStatsDetailOut(
+            id=target_args["id"],
+            category=category,
+            attendance_point_name=target_args["attendance_point_name"],
+            name=target_args["name"],
+            product_name=target_args["product_name"],
+            process_name=target_args["process_name"],
+            stamping_method=target_args["stamping_method"],
+            metric_kind=target_args["metric_kind"],
+        )
+
+    grouped_allocations: dict[tuple[date, int], list] = {}
+    group_reports: dict[tuple[date, int], object | None] = {}
+    for allocation in allocations:
+        allocation_date = getattr(allocation, "allocation_date")
+        report = getattr(allocation, "report", None)
+        report_id = getattr(allocation, "report_id", None)
+        if report_id is None and report is not None:
+            report_id = getattr(report, "id", None)
+        group_key = (allocation_date, report_id if report_id is not None else id(allocation))
+        grouped_allocations.setdefault(group_key, []).append(allocation)
+        group_reports.setdefault(group_key, report)
+
+    daily_rows: dict[date, UsageStatsDailyRow] = {}
+    report_rows: list[UsageStatsReportRow] = []
+    for (allocation_date, report_key), group in grouped_allocations.items():
+        group_matches = build_usage_stats_from_allocations(
+            allocations=group,
+            category=category,
+            equipment_type_by_key=equipment_type_by_key,
+        )
+        match = next((row for row in group_matches if _matches_target(row, **target_args)), None)
+        if match is None:
+            continue
+
+        day = daily_rows.setdefault(
+            allocation_date,
+            UsageStatsDailyRow(report_date=allocation_date),
+        )
+        day.value = round2(day.value + match.value)
+        day.report_count += match.report_count
+
+        report = group_reports[(allocation_date, report_key)]
+        employee = getattr(report, "employee", None) if report is not None else None
+        report_id = (
+            getattr(report, "id", None)
+            if report is not None
+            else getattr(group[0], "report_id", None)
+        )
+        employee_phone = getattr(report, "employee_phone", "") if report is not None else ""
+        report_rows.append(
+            UsageStatsReportRow(
+                report_id=report_id or 0,
+                report_date=allocation_date,
+                employee_phone=employee_phone,
+                employee_name=employee.name if employee else "",
+                display_name=target.name,
+                value=match.value,
+                report_count=match.report_count,
+            )
+        )
+
+    return _to_detail_out(
+        target,
+        daily_rows=sorted(daily_rows.values(), key=lambda row: row.report_date),
+        report_rows=sorted(
+            report_rows,
+            key=lambda row: (row.report_date, row.report_id),
+            reverse=True,
+        ),
+    )
+
+
 @router.get("/summary", response_model=PageResponse)
 def usage_stats_summary(
     category: str = Query("device", pattern="^(device|mold)$"),
@@ -189,11 +296,11 @@ def usage_stats_summary(
 ) -> PageResponse:
     purge_expired_voided_reports(db)
     point_names = _requested_points(db, user, attendance_point_name)
-    reports = db.scalars(_approved_reports_query(point_names, start_date, end_date)).all()
+    allocations = db.scalars(_approved_allocations_query(point_names, start_date, end_date)).all()
     rows = _sort_usage_rows(
         _filter_usage_rows(
-            build_usage_stats(
-                reports=reports,
+            build_usage_stats_from_allocations(
+                allocations=allocations,
                 category=category,
                 equipment_type_by_key=_equipment_type_map(db, point_names),
             ),
@@ -227,11 +334,11 @@ def export_usage_stats_excel(
     purge_expired_voided_reports(db)
     point_names = _requested_points(db, user, attendance_point_name)
     equipment_type_by_key = _equipment_type_map(db, point_names)
-    reports = db.scalars(_approved_reports_query(point_names, start_date, end_date)).all()
+    allocations = db.scalars(_approved_allocations_query(point_names, start_date, end_date)).all()
     device_rows = _sort_usage_rows(
         _filter_usage_rows(
-            build_usage_stats(
-                reports=reports,
+            build_usage_stats_from_allocations(
+                allocations=allocations,
                 category="device",
                 equipment_type_by_key=equipment_type_by_key,
             ),
@@ -241,8 +348,8 @@ def export_usage_stats_excel(
     )
     mold_rows = _sort_usage_rows(
         _filter_usage_rows(
-            build_usage_stats(
-                reports=reports,
+            build_usage_stats_from_allocations(
+                allocations=allocations,
                 category="mold",
                 equipment_type_by_key=equipment_type_by_key,
             ),
@@ -271,7 +378,7 @@ def usage_stats_detail(
     purge_expired_voided_reports(db)
     point_names = _requested_points(db, user, attendance_point_name)
     equipment_type_by_key = _equipment_type_map(db, point_names)
-    reports = db.scalars(_approved_reports_query(point_names, start_date, end_date)).all()
+    allocations = db.scalars(_approved_allocations_query(point_names, start_date, end_date)).all()
     target_args = {
         "id": _clean(id),
         "category": category,
@@ -282,53 +389,9 @@ def usage_stats_detail(
         "stamping_method": _clean(stamping_method),
         "metric_kind": _clean(metric_kind),
     }
-    rows = build_usage_stats(
-        reports=reports,
+    return _build_usage_stats_detail_from_allocations(
+        allocations=allocations,
         category=category,
+        target_args=target_args,
         equipment_type_by_key=equipment_type_by_key,
     )
-    target = next((row for row in rows if _matches_target(row, **target_args)), None)
-    if target is None:
-        return UsageStatsDetailOut(
-            id=target_args["id"],
-            category=category,
-            attendance_point_name=target_args["attendance_point_name"],
-            name=target_args["name"],
-            product_name=target_args["product_name"],
-            process_name=target_args["process_name"],
-            stamping_method=target_args["stamping_method"],
-            metric_kind=target_args["metric_kind"],
-        )
-
-    daily_rows: dict[date, UsageStatsDailyRow] = {}
-    report_rows: list[UsageStatsReportRow] = []
-    for report in reports:
-        report_matches = build_usage_stats(
-            reports=[report],
-            category=category,
-            equipment_type_by_key=equipment_type_by_key,
-        )
-        match = next((row for row in report_matches if _matches_target(row, **target_args)), None)
-        if match is None:
-            continue
-
-        day = daily_rows.setdefault(report.report_date, UsageStatsDailyRow(report_date=report.report_date))
-        day.value = round2(day.value + match.value)
-        day.report_count += match.report_count
-        report_rows.append(
-            UsageStatsReportRow(
-                report_id=report.id,
-                report_date=report.report_date,
-                employee_phone=report.employee_phone,
-                employee_name=report.employee.name if report.employee else "",
-                display_name=target.name,
-                value=match.value,
-                report_count=match.report_count,
-            )
-        )
-
-    return _to_detail_out(
-        target,
-        daily_rows=sorted(daily_rows.values(), key=lambda row: row.report_date),
-        report_rows=sorted(report_rows, key=lambda row: (row.report_date, row.report_id), reverse=True),
-    )