feat: 工单权限过滤+仪表盘优化+LDAP登录+审批流程+待处理工单
后端: - ticket_statistics/list_tickets 按用户身份过滤(admin全部, dba/auditor审批相关, developer自己的) - 新增 /dashboard/my-tickets 接口(按角色返回待处理工单) - auth.py 本地优先+LDAP fallback 登录认证 - ldap_config.py LDAPS 证书验证修复 - instance_detail.py developer/auditor 权限修复 前端: - Dashboard 仪表盘: 3核心大数字指标+公告+我的待处理工单 - 删除 ECharts 趋势图(无真实数据) - TicketDetailPage 审批流程时间线展示 - TicketsPage 工单统计按用户过滤+关联列(我提交的/待我审批) - types 新增 TicketApproval 等类型定义
This commit is contained in:
logan committed
1 parent
be2d6f3894
commit
43d1f3a234
10 files changed
+587
-440
No files matched your search
@@ -299,24 +299,60 @@ async def _enrich_ticket(ticket: Ticket, db: AsyncSession) -> Dict[str, Any]:
|
||||
|
||||
# Resolve current approver (审批/执行阶段的当前待审核人)
|
||||
data["current_approver_name"] = None
|
||||
if ticket.status in ("reviewing", "approved", "executing"):
|
||||
pending_approval = await db.execute(
|
||||
data["pending_steps"] = []
|
||||
if ticket.status in ("pending", "reviewing", "approved", "executing"):
|
||||
pending_result = await db.execute(
|
||||
select(TicketApproval)
|
||||
.where(
|
||||
TicketApproval.ticket_id == ticket.id,
|
||||
TicketApproval.action == "pending",
|
||||
)
|
||||
.order_by(TicketApproval.step_number)
|
||||
.limit(1)
|
||||
)
|
||||
pending = pending_approval.scalar_one_or_none()
|
||||
if pending:
|
||||
if pending.approver_id:
|
||||
r = await db.execute(select(User).where(User.id == pending.approver_id))
|
||||
approver_user = r.scalar_one_or_none()
|
||||
data["current_approver_name"] = approver_user.display_name if approver_user else None
|
||||
elif pending.approver_role:
|
||||
data["current_approver_name"] = pending.approver_role
|
||||
pending_list = pending_result.scalars().all()
|
||||
|
||||
pending_names_all = []
|
||||
for pa in pending_list:
|
||||
step_info = {
|
||||
"step_number": pa.step_number,
|
||||
"step_name": pa.step_name,
|
||||
"step_type": pa.step_type,
|
||||
"approver_names": [],
|
||||
}
|
||||
# Try ticket_approval.approver_id first
|
||||
if pa.approver_id:
|
||||
r = await db.execute(select(User).where(User.id == pa.approver_id))
|
||||
u = r.scalar_one_or_none()
|
||||
if u:
|
||||
step_info["approver_names"].append(u.display_name or u.username)
|
||||
# Fallback: resolve from workflow_steps.approver_ids
|
||||
if not step_info["approver_names"] and ticket.workflow_id:
|
||||
ws_result = await db.execute(
|
||||
select(WorkflowStep).where(
|
||||
WorkflowStep.workflow_id == ticket.workflow_id,
|
||||
WorkflowStep.step_number == pa.step_number,
|
||||
)
|
||||
)
|
||||
ws = ws_result.scalar_one_or_none()
|
||||
if ws and ws.approver_ids:
|
||||
try:
|
||||
import json as _json
|
||||
ids = _json.loads(ws.approver_ids) if isinstance(ws.approver_ids, str) else ws.approver_ids
|
||||
for uid in (ids or []):
|
||||
r = await db.execute(select(User).where(User.id == uid))
|
||||
u = r.scalar_one_or_none()
|
||||
if u:
|
||||
step_info["approver_names"].append(u.display_name or u.username)
|
||||
except (json.JSONDecodeError, TypeError):
|
||||
pass
|
||||
|
||||
if step_info["approver_names"]:
|
||||
pending_names_all.extend(step_info["approver_names"])
|
||||
data["pending_steps"].append(step_info)
|
||||
|
||||
# Backward compat: single string
|
||||
if pending_names_all:
|
||||
data["current_approver_name"] = ", ".join(dict.fromkeys(pending_names_all))
|
||||
|
||||
return data
|
||||
|
||||
@@ -411,16 +447,37 @@ async def list_tickets(
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
"""获取工单列表。
|
||||
|
||||
- admin/dba 可查看所有工单
|
||||
- developer 只能查看自己的工单
|
||||
"""
|
||||
"""获取工单列表（按用户身份过滤）。"""
|
||||
stmt = select(Ticket)
|
||||
|
||||
# 权限过滤: developer 只能看到自己的工单
|
||||
if current_user.role == "developer":
|
||||
# 权限过滤
|
||||
if current_user.role == "admin":
|
||||
pass # admin 看全部
|
||||
elif current_user.role == "developer":
|
||||
stmt = stmt.where(Ticket.applicant_id == current_user.id)
|
||||
else:
|
||||
# dba/auditor: 自己提交的 + 自己需要审批的
|
||||
from app.models.workflow import TicketApproval as _TA
|
||||
_my_sub = set((await db.execute(
|
||||
select(Ticket.id).where(Ticket.applicant_id == current_user.id)
|
||||
)).scalars().all())
|
||||
_my_appr = set((await db.execute(
|
||||
select(_TA.ticket_id).where(
|
||||
_TA.action == "pending",
|
||||
_TA.approver_id == current_user.id,
|
||||
)
|
||||
)).scalars().all())
|
||||
_my_role = set((await db.execute(
|
||||
select(_TA.ticket_id).where(
|
||||
_TA.action == "pending",
|
||||
_TA.approver_role == current_user.role,
|
||||
)
|
||||
)).scalars().all())
|
||||
_all_ids = _my_sub | _my_appr | _my_role
|
||||
if _all_ids:
|
||||
stmt = stmt.where(Ticket.id.in_(_all_ids))
|
||||
else:
|
||||
stmt = stmt.where(Ticket.applicant_id == current_user.id)
|
||||
|
||||
# 状态过滤
|
||||
if status:
|
||||
@@ -678,8 +735,38 @@ async def ticket_statistics(
|
||||
db: AsyncSession = Depends(get_db),
|
||||
current_user: User = Depends(get_current_user),
|
||||
):
|
||||
"""获取工单统计信息。"""
|
||||
stmt = select(Ticket.status, func.count(Ticket.id)).group_by(Ticket.status)
|
||||
"""获取工单统计信息（按用户身份过滤）。"""
|
||||
# 构建用户可见工单的基础查询
|
||||
base_stmt = select(Ticket)
|
||||
if current_user.role == "developer":
|
||||
# developer 只看自己提交的
|
||||
base_stmt = base_stmt.where(Ticket.applicant_id == current_user.id)
|
||||
elif current_user.role not in ("admin",):
|
||||
# dba/auditor: 看自己提交的 + 自己需要审批的
|
||||
from app.models.workflow import TicketApproval
|
||||
my_approvals = set((await db.execute(
|
||||
select(TicketApproval.ticket_id).where(
|
||||
TicketApproval.action == "pending",
|
||||
TicketApproval.approver_id == current_user.id,
|
||||
)
|
||||
)).scalars().all())
|
||||
my_role_approvals = set((await db.execute(
|
||||
select(TicketApproval.ticket_id).where(
|
||||
TicketApproval.action == "pending",
|
||||
TicketApproval.approver_role == current_user.role,
|
||||
)
|
||||
)).scalars().all())
|
||||
my_submitted = set((await db.execute(
|
||||
select(Ticket.id).where(Ticket.applicant_id == current_user.id)
|
||||
)).scalars().all())
|
||||
all_ids = my_submitted | my_approvals | my_role_approvals
|
||||
if all_ids:
|
||||
base_stmt = base_stmt.where(Ticket.id.in_(all_ids))
|
||||
else:
|
||||
base_stmt = base_stmt.where(Ticket.applicant_id == current_user.id)
|
||||
|
||||
sub = base_stmt.subquery()
|
||||
stmt = select(sub.c.status, func.count(sub.c.id)).group_by(sub.c.status)
|
||||
result = await db.execute(stmt)
|
||||
stats = {row[0]: row[1] for row in result.all()}
|
||||
|
||||
@@ -773,20 +860,31 @@ async def get_ticket_approvals(
|
||||
)
|
||||
approvals = approvals_result.scalars().all()
|
||||
|
||||
return [
|
||||
{
|
||||
# Enrich with approver display names
|
||||
result = []
|
||||
for a in approvals:
|
||||
approver_name = None
|
||||
if a.approver_id:
|
||||
u = await db.execute(select(User).where(User.id == a.approver_id))
|
||||
approver_name = u.scalar_one_or_none()
|
||||
approver_name = approver_name.display_name if approver_name else None
|
||||
|
||||
result.append({
|
||||
"id": a.id,
|
||||
"step_number": a.step_number,
|
||||
"step_name": a.step_name,
|
||||
"step_type": a.step_type,
|
||||
"approver_role": a.approver_role,
|
||||
"action": a.action,
|
||||
"approver_id": a.approver_id,
|
||||
"approver_name": approver_name,
|
||||
"comment": a.comment,
|
||||
"created_at": a.created_at.isoformat() if a.created_at else None,
|
||||
"updated_at": a.updated_at.isoformat() if a.updated_at else None,
|
||||
}
|
||||
for a in approvals
|
||||
]
|
||||
"completed_at": a.completed_at.isoformat() if a.completed_at else None,
|
||||
})
|
||||
|
||||
return result
|
||||
|
||||
|
||||
@router.post("/{ticket_id}/review")
|
||||
|
||||
Reference in new issue
Block a user