Hermes CI Fix
242f3cf5ec
R3 期间口径（仅 YYYY-MM）延伸到取数层：新增 alert_entity_scope.month_period_clause()（跨库可移植 SQL 等价式），应用到 15 个文件 26 处「按 period 倒序取最新值/最近N期」位点；dashboard 原 MySQL-only REGEXP 正则收口到同单一事实源。 GET /api/cma/subjects 响应增补 entity_id（NULL=全局标准准则科目 / N=账套私有明细），既有 10 字段语义与名称不变。 证据：pending-tasks/_reports/yanxue-20260924-cma-fetch-caliber-fixes-fullstack.md（改前/改后 A/B：F_NET_PROFIT 2026-H2/-55.0 → 2026-08/-10.46）。新增 7 例回归测试；全量 1 failed(预存在) 1473 passed，基线同项。
110 lines
4.4 KiB
Python
110 lines
4.4 KiB
Python
"""会计科目管理 — 新30号准则适配"""
|
||
from fastapi import APIRouter, Depends, HTTPException, Query
|
||
from sqlalchemy.orm import Session
|
||
from sqlalchemy import func
|
||
from typing import Optional, List
|
||
from app.database import get_db
|
||
from app.auth_middleware import require_role
|
||
from app.deps import get_entity_id
|
||
from app.models import Subject
|
||
import logging
|
||
|
||
logger = logging.getLogger("cma.subjects")
|
||
|
||
router = APIRouter(prefix="/api/cma/subjects", tags=["会计科目"],
|
||
dependencies=[Depends(require_role("ceo", "finance", "business"))],
|
||
)
|
||
|
||
|
||
@router.get("")
|
||
def list_subjects(
|
||
category: Optional[str] = Query(None, description="新30号准则分类过滤"),
|
||
keyword: Optional[str] = Query(None, description="科目名称/编码搜索"),
|
||
db: Session = Depends(get_db),
|
||
entity_id: int = Depends(get_entity_id),
|
||
):
|
||
"""科目列表 — 支持新30号准则分类筛选
|
||
|
||
账套分层（2026-09-23 `subjects` 加 `entity_id` 列）：返回**全局标准准则科目**
|
||
（`entity_id IS NULL`）∪ **本账套私有明细**（`entity_id = 会话账套`）。
|
||
行为变更（预期）：博海会话不再看到酣客智享通明细（`100106 酒窖备用金` / `100108 友赞商户` 等）。
|
||
2026-09-26（yanxue-20260924-cma-fetch-caliber-fixes）：响应**增补 `entity_id`**
|
||
（`NULL` = 全局标准准则科目；`= 会话账套` = 本账套私有明细）——原响应不含该字段，
|
||
共享层（51 行）与酣客私有（156 行）在界面上不可区分。既有 10 个字段语义与名称不变。
|
||
"""
|
||
query = db.query(Subject).filter(
|
||
Subject.is_active == 1,
|
||
(Subject.entity_id.is_(None)) | (Subject.entity_id == entity_id), # 分层读取口径
|
||
)
|
||
|
||
if category:
|
||
query = query.filter(Subject.new_standard_category == category)
|
||
|
||
if keyword:
|
||
like = f"%{keyword}%"
|
||
query = query.filter(
|
||
Subject.subject_name.like(like) | Subject.subject_code.like(like)
|
||
)
|
||
|
||
subjects = query.order_by(Subject.subject_code).all()
|
||
|
||
return {
|
||
"total": len(subjects),
|
||
"data": [
|
||
{
|
||
"id": s.id,
|
||
"subject_code": s.subject_code,
|
||
"subject_name": s.subject_name,
|
||
"parent_code": s.parent_code,
|
||
"level": s.level,
|
||
"category": s.category,
|
||
"new_standard_category": s.new_standard_category,
|
||
"is_active": s.is_active,
|
||
"remark": s.remark,
|
||
"entity_id": s.entity_id,
|
||
"updated_at": s.updated_at.isoformat() if s.updated_at else None,
|
||
}
|
||
for s in subjects
|
||
],
|
||
}
|
||
|
||
|
||
@router.put("/{subject_id}")
|
||
def update_subject_category(
|
||
subject_id: int,
|
||
new_standard_category: str = Query(..., description="operating/investing/financing/tax/discontinued"),
|
||
db: Session = Depends(get_db),
|
||
):
|
||
"""更新单个科目的新30号准则分类"""
|
||
subject = db.query(Subject).filter(Subject.id == subject_id).first()
|
||
if not subject:
|
||
raise HTTPException(status_code=404, detail="科目不存在")
|
||
|
||
valid = {"operating", "operating_rd", "operating_fx", "investing",
|
||
"financing", "financing_fx", "tax", "discontinued"}
|
||
if new_standard_category not in valid:
|
||
raise HTTPException(status_code=400, detail=f"无效的分类: {new_standard_category}")
|
||
|
||
subject.new_standard_category = new_standard_category
|
||
db.commit()
|
||
return {"message": "更新成功", "subject_id": subject_id, "new_standard_category": new_standard_category}
|
||
|
||
|
||
@router.put("/batch/category")
|
||
def batch_update_category(
|
||
ids: List[int] = Query(..., description="科目ID列表"),
|
||
new_standard_category: str = Query(..., description="operating/investing/financing/tax/discontinued"),
|
||
db: Session = Depends(get_db),
|
||
):
|
||
"""批量更新科目新30号准则分类"""
|
||
valid = {"operating", "operating_rd", "operating_fx", "investing",
|
||
"financing", "financing_fx", "tax", "discontinued"}
|
||
if new_standard_category not in valid:
|
||
raise HTTPException(status_code=400, detail=f"无效的分类: {new_standard_category}")
|
||
|
||
updated = db.query(Subject).filter(
|
||
Subject.id.in_(ids), Subject.is_active == 1
|
||
).update({"new_standard_category": new_standard_category}, synchronize_session=False)
|
||
db.commit()
|
||
return {"message": f"批量更新成功", "updated_count": updated}
|