ci/woodpecker/push/main Pipeline failed
- ① kpi_templates instantiate 构造点显式传会话账套(原缺 entity_id ⇒ 静默落 e1),kpi_code 判重按账套收紧
- ② kpi_subject_map 3 个读取点加护栏注释(不加列、不改语义)
- ③ subjects 分层:读口 union(NULL=全局标准准则科目 / N=账套私有),UPSERT 唯一键改 (entity_id, subject_code)
- ④ analysis_results 账套化:读/写/删三端点按会话账套判定归属(列未落地时 kpi_code JOIN 止血),
无归属行进 unattributed 登记、删除一律 404
- 模型层按现网 DDL 补齐:KPIDefinition(template_id/is_system + uk_entity_kpi)、AnalysisResult.entity_id、Subject.entity_id
- 新增 migrate_{subjects,analysis_results}_entity_id_20260923.py(--check/--apply/--down)、
22 条对账用例 test_entity_dimension_convergence_20260923.py
DDL 已由 ops 受控通道落地(subjects 21:31:56 / analysis_results 21:31:59 CST,审批 1e9b4d9a/5ffb1640)
本提交为切片提交,未 push(发布须另取放行)
187 lines
7.4 KiB
Python
187 lines
7.4 KiB
Python
"""KPI模板库 API — 管理会计OS
|
|
支持系统预置模板 + 用户自定义模板
|
|
从模板实例化创建KPI时,复制模板快照到kpi_definitions"""
|
|
from fastapi import APIRouter, Depends, HTTPException, Query
|
|
from sqlalchemy.orm import Session
|
|
from typing import Optional
|
|
from datetime import datetime
|
|
|
|
from app.database import get_db
|
|
from app.auth_middleware import require_role
|
|
from app.deps import get_entity_id
|
|
from app.models import KPITemplate, KPIDefinition, OperationLog
|
|
from app.api.kpi_governance import validate_kpi_payload, kpi_issues_message
|
|
|
|
router = APIRouter(prefix="/api/cma/templates", tags=["KPI模板库"],
|
|
dependencies=[Depends(require_role("ceo", "finance", "business", "it"))],
|
|
)
|
|
|
|
WRITE_ROLES = Depends(require_role("ceo", "finance", "it"))
|
|
|
|
|
|
def template_to_dict(t):
|
|
return {c.name: getattr(t, c.name) for c in t.__table__.columns}
|
|
|
|
|
|
@router.get("")
|
|
def list_templates(
|
|
dimension: Optional[str] = None,
|
|
category: Optional[str] = None,
|
|
keyword: Optional[str] = None,
|
|
is_system: Optional[int] = None,
|
|
db: Session = Depends(get_db),
|
|
):
|
|
"""获取模板列表,支持按维度/类别/关键字筛选"""
|
|
query = db.query(KPITemplate)
|
|
if dimension:
|
|
query = query.filter(KPITemplate.dimension == dimension)
|
|
if category:
|
|
query = query.filter(KPITemplate.category == category)
|
|
if keyword:
|
|
query = query.filter(KPITemplate.kpi_name.contains(keyword))
|
|
if is_system is not None:
|
|
query = query.filter(KPITemplate.is_system == is_system)
|
|
templates = query.order_by(KPITemplate.is_system.desc(), KPITemplate.kpi_code).all()
|
|
return {"total": len(templates), "data": [template_to_dict(t) for t in templates]}
|
|
|
|
|
|
@router.get("/{template_id}")
|
|
def get_template(template_id: int, db: Session = Depends(get_db)):
|
|
t = db.query(KPITemplate).filter(KPITemplate.id == template_id).first()
|
|
if not t:
|
|
raise HTTPException(404, "模板不存在")
|
|
return template_to_dict(t)
|
|
|
|
|
|
@router.post("")
|
|
def create_template(data: dict, db: Session = Depends(get_db), user=WRITE_ROLES):
|
|
"""用户创建自定义模板"""
|
|
existing = db.query(KPITemplate).filter(KPITemplate.kpi_code == data.get("kpi_code", "")).first()
|
|
if existing:
|
|
raise HTTPException(400, f"模板编码 {data['kpi_code']} 已存在")
|
|
t = KPITemplate(
|
|
kpi_code=data.get("kpi_code"),
|
|
kpi_name=data.get("kpi_name"),
|
|
dimension=data.get("dimension"),
|
|
category=data.get("category"),
|
|
formula=data.get("formula"),
|
|
formula_desc=data.get("formula_desc"),
|
|
unit=data.get("unit", "%"),
|
|
target_value=data.get("target_value"),
|
|
description=data.get("description"),
|
|
is_system=0, # 用户创建的永远不是系统模板
|
|
usage_count=0,
|
|
)
|
|
db.add(t)
|
|
db.commit()
|
|
db.refresh(t)
|
|
_log(db, 1, "create", "template", t.id, {"kpi_code": t.kpi_code, "kpi_name": t.kpi_name})
|
|
return template_to_dict(t)
|
|
|
|
|
|
@router.put("/{template_id}")
|
|
def update_template(template_id: int, data: dict, db: Session = Depends(get_db), user=WRITE_ROLES):
|
|
"""修改自定义模板(系统预置不可修改)"""
|
|
t = db.query(KPITemplate).filter(KPITemplate.id == template_id).first()
|
|
if not t:
|
|
raise HTTPException(404, "模板不存在")
|
|
if t.is_system:
|
|
raise HTTPException(403, "系统预置模板不可修改")
|
|
for k, v in data.items():
|
|
if hasattr(t, k) and v is not None:
|
|
setattr(t, k, v)
|
|
db.commit()
|
|
return template_to_dict(t)
|
|
|
|
|
|
@router.delete("/{template_id}")
|
|
def delete_template(template_id: int, db: Session = Depends(get_db), user=WRITE_ROLES):
|
|
"""删除自定义模板(系统预置不可删除)"""
|
|
t = db.query(KPITemplate).filter(KPITemplate.id == template_id).first()
|
|
if not t:
|
|
raise HTTPException(404, "模板不存在")
|
|
if t.is_system:
|
|
raise HTTPException(403, "系统预置模板不可删除")
|
|
db.delete(t)
|
|
db.commit()
|
|
return {"message": "模板已删除"}
|
|
|
|
|
|
@router.post("/{template_id}/instantiate")
|
|
def instantiate_template(template_id: int, data: dict, db: Session = Depends(get_db),
|
|
user=WRITE_ROLES, entity_id: int = Depends(get_entity_id)):
|
|
"""从模板实例化创建KPI,复制模板快照到kpi_definitions
|
|
|
|
账套维度(2026-09-23 账套维度收口批 ①):新 KPI 显式挂**会话账套**,不做静默兜底。
|
|
历史缺陷:本构造点未传 `entity_id` ⇒ 模型 `default=1` 把任意账套实例化出的 KPI
|
|
静默挂到酣客(e1),与「建预算未写账套」同源。
|
|
判重口径:`kpi_code` 唯一性按账套判定(库内 `uk_entity_kpi(UNIQUE entity_id,kpi_code)`);
|
|
全表判重会让博海无法建与酣客同码的 KPI(反之则放过同账套重复)。
|
|
"""
|
|
t = db.query(KPITemplate).filter(KPITemplate.id == template_id).first()
|
|
if not t:
|
|
raise HTTPException(404, "模板不存在")
|
|
|
|
kpi_code = data.get("kpi_code", t.kpi_code)
|
|
kpi_name = data.get("kpi_name", t.kpi_name)
|
|
|
|
# 检查编码唯一性(按账套收紧:仅本账套内判重)
|
|
existing = db.query(KPIDefinition).filter(
|
|
KPIDefinition.kpi_code == kpi_code,
|
|
KPIDefinition.entity_id == entity_id,
|
|
).first()
|
|
if existing:
|
|
raise HTTPException(400, f"KPI编码 {kpi_code} 在本账套已存在,请修改")
|
|
|
|
# 数据治理:入库必检(规则1) + 编码规范(规则3)
|
|
merged = {
|
|
"kpi_code": kpi_code,
|
|
"kpi_name": kpi_name,
|
|
"dimension": data.get("dimension", t.dimension),
|
|
"category": data.get("category", t.category),
|
|
"formula": data.get("formula", t.formula),
|
|
"unit": data.get("unit", t.unit or "%"),
|
|
"target_value": data.get("target_value", t.target_value),
|
|
}
|
|
gov_issues = [i for i in validate_kpi_payload(merged, db=db) if i["rule"] in (1, 3)]
|
|
if gov_issues:
|
|
raise HTTPException(422, detail={"message": "数据校验不通过", "errors": kpi_issues_message(gov_issues)})
|
|
|
|
kpi = KPIDefinition(
|
|
entity_id=entity_id, # 账套维度:显式挂会话账套(不得依赖模型 default=1)
|
|
template_id=t.id,
|
|
is_system=0, # 从模板实例化的KPI不是系统预置
|
|
kpi_code=kpi_code,
|
|
kpi_name=kpi_name,
|
|
dimension=data.get("dimension", t.dimension),
|
|
category=data.get("category", t.category),
|
|
formula=data.get("formula", t.formula),
|
|
formula_desc=data.get("formula_desc", t.formula_desc),
|
|
unit=data.get("unit", t.unit or "%"),
|
|
target_value=data.get("target_value", t.target_value),
|
|
objective=data.get("objective"),
|
|
data_source_type=data.get("data_source_type", "manual"),
|
|
frequency=data.get("frequency", "monthly"),
|
|
responsible_dept=data.get("responsible_dept"),
|
|
responsible_user=data.get("responsible_user"),
|
|
status="active",
|
|
)
|
|
db.add(kpi)
|
|
db.commit()
|
|
db.refresh(kpi)
|
|
|
|
# 更新模板使用计数
|
|
t.usage_count = (t.usage_count or 0) + 1
|
|
db.commit()
|
|
|
|
_log(db, 1, "create", "kpi", kpi.id, {"from_template": template_id, "kpi_code": kpi.kpi_code})
|
|
return {c.name: getattr(kpi, c.name) for c in kpi.__table__.columns}
|
|
|
|
|
|
def _log(db, user_id, action, target_type, target_id, detail):
|
|
import json
|
|
log = OperationLog(user_id=user_id, action=action, target_type=target_type,
|
|
target_id=target_id, detail=json.dumps(detail, ensure_ascii=False) if detail else None)
|
|
db.add(log)
|
|
db.commit()
|