refactor(backend): 仓储层散参数收敛为查询 DTO
仓储层的 list_*/count_* 此前以 keyword/status/offset/limit 四五个散参数 传参,调用点重复铺开、易漏传且不可扩展;按项目「参数 >4 封装 DTO」的 约定统一收敛为各模块的 Query 对象(如 RoleQuery、BusinessQuery), 服务层与测试调用同步调整,行为不变。 - repositories 层查询方法签名改为 (session, query),分页与筛选条件 由 Query 承载,_apply_filters 同步收口 - schemas 层补齐各模块 Query 模型(approval/business_role/report 等) - services 层调用点同步改为传 Query - tests 随之调整;新增用例:待办角色流转(财务通过后领导出现待办)、 参数预览顺序稳定 验证:全量 pytest 900 passed(11:08);单元 526 passed;ruff check 绿。 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
1 parent
c48d24ab6d
commit
5ece9f6dab
45 files changed
+1045
-1028
No files matched your search
@@ -49,7 +49,8 @@ class ApprovalOrderDetailOut(ApprovalOrderOut):
|
||||
|
||||
steps: list[ApprovalStepOut] = Field(default_factory=list)
|
||||
snapshot: dict[str, Any] | None = Field(
|
||||
default=None, description="提交时内容快照(信封:schema_version/order_type/captured_at/data)"
|
||||
default=None,
|
||||
description="提交时内容快照(信封:schema_version/order_type/captured_at/data)",
|
||||
)
|
||||
content_source: Literal["snapshot", "live", "missing"] = Field(
|
||||
default="missing", description="审批内容来源:提交时快照/当前内容回退/缺失"
|
||||
|
||||
@@ -27,6 +27,19 @@ class BusinessRoleOut(BaseModel):
|
||||
is_builtin: int = 0
|
||||
|
||||
|
||||
class BusinessRoleOptionOut(BaseModel):
|
||||
"""岗位下拉选项(人员档案与报表筛选共用)。
|
||||
|
||||
与 ``BusinessRoleOut`` 分开:下拉只需渲染用的最小字段集,不必顺带
|
||||
暴露计提模板等管理字段。字段名直出蛇形(前端按同名取值)。
|
||||
"""
|
||||
|
||||
id: int = Field(description="岗位ID")
|
||||
role_code: str = Field(description="岗位编码")
|
||||
role_name: str = Field(description="岗位名称")
|
||||
status: int = Field(description="状态:1启用 0禁用")
|
||||
|
||||
|
||||
class TemplateParamOut(BaseModel):
|
||||
"""模板声明的参数(供岗位表单展示,含当前口径说明)。"""
|
||||
|
||||
|
||||
@@ -264,7 +264,9 @@ class DepartmentReconciliation(BaseModel):
|
||||
description="聚合额 − 团队分成合计 − 全公司分成合计(分列舍入差)",
|
||||
)
|
||||
adjust_net_total: Decimal = Field(description="明细层调整净额合计(成员 + 未分配)")
|
||||
payable_total: Decimal = Field(description="应发合计 = 成员应付 + 未分配应付 + 聚合行 + 调整净额")
|
||||
payable_total: Decimal = Field(
|
||||
description="应发合计 = 成员应付 + 未分配应付 + 聚合行 + 调整净额"
|
||||
)
|
||||
team_base_total: Decimal = Field(description="展示团队基数合计")
|
||||
unassigned_performance_total: Decimal = Field(description="展示未分配人员绩效合计")
|
||||
other_team_base: Decimal = Field(
|
||||
|
||||
Reference in new issue
Block a user