feat(migration): V6 系统设置/二次分配/审批表与角色参数种子
- 新增 system_settings（公司信息单行）/ business_secondary_allocations（二次 分配明细，比例不强制合计满额，分摊计算待澄清另批）/ approval_orders+ approval_steps（三级审批状态机，开关关闭自动通过留痕） - roles 种子新增营销后勤/财务/领导三职能角色；内置保护改 BUILTIN_ROLE_CODES 白名单（roles 表无 is_builtin 列，不加列） - PARAM_REGISTRY 首例 BOOL：两个审批开关（16→18 项，种子双写） - 双轨同步：V6 导出 SQL + init-dev.sql（表/索引/种子/版本号 79bcc5aa98d4） - 测试同步：EXPECTED_TABLES 四新表、角色种子断言 5 角色、目录断言 18 项 八分组、BOOL 校验边界；迁移 downgrade 修 1553（只保留 drop_table）并补 行级种子反向清理 Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
liuwenxinandClaude Code committed
1 parent
94c49138bf
commit
acf87fdfdc
14 files changed
+918
-25
No files matched your search
@@ -9,8 +9,9 @@
|
||||
`Base.metadata` 包含全部表，漏掉一张就会生成「删除该表」的迁移。
|
||||
"""
|
||||
|
||||
from app.models.approval import ApprovalOrder, ApprovalStep
|
||||
from app.models.base import Base, TimestampMixin
|
||||
from app.models.business import Business, BusinessItem, BusinessStatusLog
|
||||
from app.models.business import Business, BusinessItem, BusinessStatusLog, SecondaryAllocation
|
||||
from app.models.business_role import BusinessRole
|
||||
from app.models.customer import Customer, OwnershipChangeLog
|
||||
from app.models.login_log import LoginLog
|
||||
@@ -22,9 +23,12 @@ from app.models.rating import CustomerRatingGrade
|
||||
from app.models.receipt import Receipt
|
||||
from app.models.role import Permission, Role, RolePermission
|
||||
from app.models.shipment import Shipment, ShipmentItem
|
||||
from app.models.system_setting import SystemSetting
|
||||
from app.models.user import User, UserRole
|
||||
|
||||
__all__ = [
|
||||
"ApprovalOrder",
|
||||
"ApprovalStep",
|
||||
"Base",
|
||||
"Business",
|
||||
"BusinessItem",
|
||||
@@ -46,8 +50,10 @@ __all__ = [
|
||||
"Receipt",
|
||||
"Role",
|
||||
"RolePermission",
|
||||
"SecondaryAllocation",
|
||||
"Shipment",
|
||||
"ShipmentItem",
|
||||
"SystemSetting",
|
||||
"TimestampMixin",
|
||||
"User",
|
||||
"UserRole",
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
"""审批模型：审批单与节点记录（2026-10-15 复核审批补充需求）。
|
||||
|
||||
三级链路：营销后勤提交 → 财务复核 → 领导审核。行为由参数体系开关驱动
|
||||
（`approval.*.enabled` BOOL）：关闭=提交即生成「自动通过」节点留痕，
|
||||
留痕不断链（开发计划 3.2(三)）；开启=按节点人工审核，一驳全驳。
|
||||
|
||||
依赖说明：节点准入按登录角色编码判定（ROLE_FINANCE/ROLE_LEADER），
|
||||
不动 `permissions`/`role_permissions` 闲置表 —— 细粒度权限清单待业务方
|
||||
答复（待澄清 #6）后再激活。
|
||||
|
||||
ref_id 为**固化无外键**（同 business_status_logs 先例）：order_type=2
|
||||
（月结预留）将指向 ④ 尚未落地的表，外键无法统一指向；单据删除保护由
|
||||
服务层承担（详见 approval_service）。
|
||||
"""
|
||||
|
||||
from datetime import datetime
|
||||
|
||||
from sqlalchemy import DateTime, ForeignKey, Index, String, text
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, TINYINT_TYPE, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
# 审批单状态（approval_orders.status；流转机见 approval_service）
|
||||
APPROVAL_STATUS_PENDING_FINANCE = 1 # 待财务复核
|
||||
APPROVAL_STATUS_PENDING_LEADER = 2 # 待领导审核
|
||||
APPROVAL_STATUS_APPROVED = 3 # 已通过（终态）
|
||||
APPROVAL_STATUS_REJECTED = 4 # 已驳回（终态）
|
||||
APPROVAL_STATUS_WITHDRAWN = 5 # 已撤回（被引用方重新提交时旧在途单注销）
|
||||
|
||||
# 节点（approval_steps.node；0 仅用于撤回留痕）
|
||||
APPROVAL_NODE_FINANCE = 1
|
||||
APPROVAL_NODE_LEADER = 2
|
||||
APPROVAL_NODE_WITHDRAW = 0
|
||||
APPROVAL_NODES = {
|
||||
APPROVAL_STATUS_PENDING_FINANCE: APPROVAL_NODE_FINANCE,
|
||||
APPROVAL_STATUS_PENDING_LEADER: APPROVAL_NODE_LEADER,
|
||||
}
|
||||
|
||||
# 动作（approval_steps.action）
|
||||
APPROVAL_ACTION_APPROVE = 1 # 人工通过
|
||||
APPROVAL_ACTION_REJECT = 2 # 人工驳回
|
||||
APPROVAL_ACTION_AUTO_APPROVE = 3 # 系统自动通过（开关关闭时逐节点留痕）
|
||||
APPROVAL_ACTION_WITHDRAW = 4 # 撤回（业务重新提交时旧在途单注销）
|
||||
|
||||
|
||||
class ApprovalOrder(Base, TimestampMixin):
|
||||
"""审批单：一张待审对象一条审批流（状态可流转，含 update_time）。"""
|
||||
|
||||
__tablename__ = "approval_orders"
|
||||
__table_args__ = mysql_table_args(
|
||||
"审批单表（营销后勤提交→财务复核→领导审核；开关关闭时自动通过留痕）",
|
||||
Index("idx_approval_orders_type_status", "order_type", "status"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
order_no: Mapped[str] = mapped_column(
|
||||
String(32),
|
||||
nullable=False,
|
||||
unique=True,
|
||||
comment="审批单号，自动生成 AP{YYYYMMDD}-{4位当日序号}",
|
||||
)
|
||||
order_type: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="审批对象类型：1二次分配方案 2月度结算（预留）"
|
||||
)
|
||||
ref_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
comment="引用对象ID（order_type=1 时为 businesses.id；固化无外键，删除保护由服务层承担）",
|
||||
)
|
||||
refer_no: Mapped[str] = mapped_column(
|
||||
String(32), nullable=False, comment="引用对象单号（冗余固化，列表页免联查）"
|
||||
)
|
||||
status: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE,
|
||||
nullable=False,
|
||||
server_default="1",
|
||||
comment="审批状态：1待财务复核 2待领导审核 3已通过 4已驳回 5已撤回",
|
||||
)
|
||||
submitter_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="提交人ID（账号删除后置空）",
|
||||
)
|
||||
submitter_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="提交人用户名（冗余固化）"
|
||||
)
|
||||
|
||||
|
||||
class ApprovalStep(Base):
|
||||
"""审批节点记录表（append-only）：每次动作只增不改，构成时间线。
|
||||
|
||||
不继承 TimestampMixin（留痕无更新语义，同 business_status_logs 先例）。
|
||||
"""
|
||||
|
||||
__tablename__ = "approval_steps"
|
||||
__table_args__ = mysql_table_args(
|
||||
"审批节点记录表（append-only；自动通过/撤回均有留痕）",
|
||||
Index("idx_approval_steps_order_id", "order_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
order_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("approval_orders.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="审批单ID（approval_orders.id；单删记录随删）",
|
||||
)
|
||||
node: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="审批节点：0撤回留痕 1财务复核 2领导审核"
|
||||
)
|
||||
action: Mapped[int] = mapped_column(
|
||||
TINYINT_TYPE, nullable=False, comment="动作：1通过 2驳回 3自动通过 4撤回"
|
||||
)
|
||||
opinion: Mapped[str | None] = mapped_column(String(255), comment="审批意见（驳回时填写）")
|
||||
operator_id: Mapped[int | None] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("users.id", ondelete="SET NULL"),
|
||||
comment="操作人ID（自动通过/系统动作置空）",
|
||||
)
|
||||
operator_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="操作人用户名（冗余固化；系统动作记「系统」）"
|
||||
)
|
||||
create_time: Mapped[datetime] = mapped_column(
|
||||
DateTime, nullable=False, server_default=text("CURRENT_TIMESTAMP"), comment="创建时间"
|
||||
)
|
||||
@@ -33,6 +33,58 @@ BUSINESS_STATUS_DONE = 2
|
||||
BUSINESS_STATUS_TERMINATED = 3
|
||||
|
||||
|
||||
class SecondaryAllocation(Base, TimestampMixin):
|
||||
"""二次分配方案明细表（2026-10-15 补充需求「二次分配方案」）。
|
||||
|
||||
口径（AI_CONTEXT 待澄清 #1/#2 未答复前的边界）：
|
||||
- 只出现在合同刚建立时；修改在首次月结前留痕放行，月结后只读（月结在 ④，
|
||||
终态门槛先行承担「修改不影响已结算月份」）
|
||||
- 分配比例**不要求合计 100%**：余额归属未定（澄清 #2），存储只落参与人
|
||||
与比例，响应以 hint 提示合计/余额，不做强制校验
|
||||
- T+ 无二次分配数据（2026-10-15 回馈）：参与人全为系统内人工维护
|
||||
- **分摊计算不在本期**（澄清 #1 分配标的三种口径结果不同）：④ 核算时按
|
||||
核算时刻读「当前生效行」做快照，天然隔离历史版本，故无版本表
|
||||
|
||||
personnel 外键 **RESTRICT**：被方案引用的人员禁删——分摊金额待定的记录
|
||||
不允许静默失联（silently deleted）导致回档无法人工查验；personnel_name
|
||||
冗余固化，人离职后方案回显仍有名。uk 锁 (business_id, personnel_id)，
|
||||
同一合同的同一参与人仅一行，重复提交在服务层聚合。
|
||||
"""
|
||||
|
||||
__tablename__ = "business_secondary_allocations"
|
||||
__table_args__ = mysql_table_args(
|
||||
# 表/列注释避开「%」字符：SHOW CREATE TABLE 经驱动参数化转义为「%%」，
|
||||
# 会与 ORM 侧 comment 字面断言失配（全库既有注释同此惯例）
|
||||
"业务二次分配方案明细表（合同建立时录入；比例不要求合计满额，余额归属待澄清）",
|
||||
Index("idx_business_secondary_allocations_business_id", "business_id"),
|
||||
Index("idx_business_secondary_allocations_personnel_id", "personnel_id"),
|
||||
)
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
business_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("businesses.id", ondelete="CASCADE"),
|
||||
nullable=False,
|
||||
comment="业务ID（businesses.id；业务删除随删）",
|
||||
)
|
||||
personnel_id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED,
|
||||
ForeignKey("personnel.id", ondelete="RESTRICT"),
|
||||
nullable=False,
|
||||
comment="参与业务员ID（personnel.id；被方案引用禁删）",
|
||||
)
|
||||
personnel_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="参与业务员姓名（冗余固化，离职后回显有名）"
|
||||
)
|
||||
ratio: Mapped[Decimal] = mapped_column(
|
||||
Numeric(5, 2),
|
||||
nullable=False,
|
||||
comment="分摊比例（0-100 两位小数；不要求合计满额，余额归属待澄清#2）",
|
||||
)
|
||||
|
||||
|
||||
class Business(Base, TimestampMixin, TPlusSyncMixin):
|
||||
"""业务表（需求 2.2.1）：业务编号自动生成，即报表 2.4.1 的「合同编号」。"""
|
||||
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
"""系统设置模型：公司信息单例行。
|
||||
|
||||
与 M1 计提参数体系刻意分离：公司名称/logo 是「展示事实」，没有按生效日期
|
||||
时点化演算的语义（参数体系按 effective_date 取值快照），且参数值列
|
||||
value_text 为 String(64) 装不下；故独立单行表。logo 只存相对路径——文件在
|
||||
`backend/uploads/logo/`，独立于数据库备份体积且可单独替换（见
|
||||
system_setting_service）。整个系统恒为单行（迁移种子 id=1 保底，upsert 维护）。
|
||||
"""
|
||||
|
||||
from sqlalchemy import String
|
||||
from sqlalchemy.orm import Mapped, mapped_column
|
||||
|
||||
from app.models.base import BIGINT_UNSIGNED, Base, TimestampMixin, mysql_table_args
|
||||
|
||||
|
||||
class SystemSetting(Base, TimestampMixin):
|
||||
"""系统设置表：本期仅公司信息（公司名称 / logo 路径），全系统单行 id=1。"""
|
||||
|
||||
__tablename__ = "system_settings"
|
||||
__table_args__ = mysql_table_args("系统设置表（公司信息，全系统单行）")
|
||||
|
||||
id: Mapped[int] = mapped_column(
|
||||
BIGINT_UNSIGNED, primary_key=True, autoincrement=True, comment="主键ID"
|
||||
)
|
||||
company_name: Mapped[str] = mapped_column(
|
||||
String(64), nullable=False, comment="公司名称（登录页与导出页眉展示）"
|
||||
)
|
||||
logo_path: Mapped[str | None] = mapped_column(
|
||||
String(255),
|
||||
comment="logo 相对路径（文件存 uploads/logo/，null=未上传使用默认）",
|
||||
)
|
||||
Reference in new issue
Block a user