logan
08f0f88cf1
后端: - Ticket model 新增 ticket_no 字段(格式: YYYYMMDDHHmmss+ms+seq, 如20260522160543841) - create_ticket 自动生成工单编号(flush后生成) - _enrich_ticket 新增 instance_name, current_approver_name 字段 - current_approver: 从 ticket_approvals 查询第一个 pending 状态的审批步骤获取审核人 - TicketResponse schema 新增 ticket_no, instance_name, current_approver_name - 新增 /instances/accessible endpoint(按用户权限组过滤实例, 无admin bypass) - instance_group response_model 改为 InstanceGroupDetailResponse(含readonly/write实例) - instance_group_members 脏数据清理, 重建 group_id=2 正确数据 - notification 模板修复: \n→\n 换行, 钉钉 \n→\n\n 双换行 - test_notification endpoint 改为真正调用 NotificationSender.send() - auditor 角色添加到 audit_rule/ticket 只读端点 - seed_data() 创建4个默认用户(admin/zhangsan/laoliu/lurenjia) - SQLite ALTER TABLE 添加 ticket_no 列, 迁移现有6条工单数据 前端: - TicketsPage 完全重设计: 工单编号/实例名称/提交人/当前审核人/状态/操作 - 状态映射简化: pending/reviewing/approved→审核中, success→完成, failed→失败 - 执行详情弹框: 解析 execute_result JSON 展示状态/影响行数/耗时/验证/原始输出/错误信息 - 状态流程可视化(提交→审批→通过→执行→完成) - 快速筛选: 全部/待审批/执行中/完成/失败 (合并 pending+reviewing+approved 统计) - TicketCreatePage: 去掉数据库类型选择器, 用 accessible(write) 过滤变更实例 - QueriesPage: 用 accessible(readonly) 过滤查询实例 - instance.ts 新增 accessible 方法 - 分页优化: 动态计算页码范围(总页>5时中间滚动)
80 lines
1.8 KiB
Python
80 lines
1.8 KiB
Python
"""审批流程 Pydantic Schemas。"""
|
|
from typing import List, Optional
|
|
from pydantic import BaseModel, ConfigDict
|
|
from datetime import datetime
|
|
|
|
|
|
class WorkflowStepCreate(BaseModel):
|
|
step_number: int
|
|
name: str
|
|
step_type: str = "serial" # serial / parallel / any_one
|
|
approver_role: Optional[str] = None
|
|
approver_ids: Optional[str] = None # JSON list
|
|
is_required: bool = True
|
|
timeout_hours: int = 24
|
|
auto_approve_on_timeout: bool = False
|
|
|
|
|
|
class WorkflowStepResponse(WorkflowStepCreate):
|
|
id: int
|
|
workflow_id: int
|
|
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
|
|
class WorkflowCreate(BaseModel):
|
|
name: str
|
|
description: Optional[str] = None
|
|
is_default: bool = False
|
|
steps: List[WorkflowStepCreate]
|
|
|
|
|
|
class WorkflowUpdate(BaseModel):
|
|
name: Optional[str] = None
|
|
description: Optional[str] = None
|
|
is_active: Optional[bool] = None
|
|
steps: Optional[List[WorkflowStepCreate]] = None
|
|
|
|
|
|
class WorkflowResponse(BaseModel):
|
|
id: int
|
|
name: str
|
|
description: Optional[str]
|
|
is_default: bool
|
|
is_active: bool
|
|
created_at: Optional[datetime]
|
|
steps: List[WorkflowStepResponse]
|
|
|
|
model_config = ConfigDict(from_attributes=True)
|
|
|
|
|
|
class TicketApprovalResponse(BaseModel):
|
|
id: int
|
|
ticket_id: int
|
|
step_number: int
|
|
step_name: Optional[str]
|
|
approver_id: Optional[int]
|
|
approver_role: Optional[str]
|
|
approver_name: Optional[str] = None
|
|
action: str
|
|
comment: Optional[str]
|
|
created_at: Optional[datetime]
|
|
updated_at: Optional[datetime]
|
|
|
|
|
|
class ApprovalProgressResponse(BaseModel):
|
|
ticket_id: int
|
|
current_step: int
|
|
total_steps: int
|
|
status: str
|
|
steps: List[dict]
|
|
|
|
|
|
class ApprovalActionRequest(BaseModel):
|
|
comment: Optional[str] = ""
|
|
|
|
|
|
class TransferRequest(BaseModel):
|
|
to_user_id: int
|
|
comment: Optional[str] = ""
|