This commit is contained in:
zlwu committed 2026-07-21 15:23:59 +08:00
1 parent 417d6c9c51
commit c8fe0cdc20
102 files changed
+19847 -12224

No files matched your search

+41 -2
View File
@@ -464,6 +464,12 @@ class OaStartInstanceBody(BaseModel):
source_instance_id: Optional[str] = Field(None, alias="sourceInstanceId")
class OaFlowPreviewBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
form_data: Optional[Dict[str, Any]] = Field(None, alias="formData")
initiator_select_user_ids: Optional[List[str]] = Field(None, alias="initiatorSelectUserIds")
class OaTaskActionBody(BaseModel):
model_config = ConfigDict(populate_by_name=True)
comment: Optional[str] = None
@@ -514,14 +520,46 @@ async def get_oa_template(
return error_response(400, str(e))
@router.get("/templates/{app_id}/flow-preview")
@router.post("/templates/{app_id}/flow-preview")
async def preview_oa_template_flow(
app_id: str,
body: OaFlowPreviewBody,
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
"""发起前预览审批链(条件齐后解析最终路径与审批人)。"""
from app.services.oa_engine import OaEngineError, preview_start_flow
try:
tenant_no = _get_tenant_no(db, user)
uid = user.get("user_id") or ""
dept_id = None
if uid:
row = db.query(SysUser).filter(SysUser.id == uid, SysUser.del_flag == 0).first()
if row:
dept_id = row.dept_id
data = preview_start_flow(
db,
tenant_no=tenant_no,
app_id=app_id,
initiator_user_id=uid,
initiator_dept_id=dept_id,
initiator_select_user_ids=body.initiator_select_user_ids,
form_data=body.form_data,
)
return success_response(data)
except OaEngineError as e:
return error_response(400, str(e))
@router.get("/templates/{app_id}/flow-preview")
async def preview_oa_template_flow_get(
app_id: str,
initiator_select_user_ids: Optional[str] = Query(None, alias="initiatorSelectUserIds"),
user: dict = Depends(require_admin_or_super_admin),
db: Session = Depends(get_db),
):
"""发起前预览审批链(解析具体审批人)。"""
"""兼容旧 GET:无 formData,含条件分支时多为待确定占位。"""
from app.services.oa_engine import OaEngineError, preview_start_flow
try:
@@ -542,6 +580,7 @@ async def preview_oa_template_flow(
initiator_user_id=uid,
initiator_dept_id=dept_id,
initiator_select_user_ids=select_ids,
form_data=None,
)
return success_response(data)
except OaEngineError as e: