This commit is contained in:
zlwu committed 2026-07-15 16:20:48 +08:00
1 parent c9711d0dce
commit 28e59a2262
218 files changed
+20698 -7413

No files matched your search

@@ -1,5 +0,0 @@
-- 科研捐赠单:传染病检测报告附件字段
-- 2026-07-13
ALTER TABLE `biz_research_donation`
ADD COLUMN `infectious_disease_report_urls` text COLLATE utf8mb4_unicode_ci COMMENT '传染病检测报告附件URL(逗号分隔)' AFTER `attachment_urls`;
@@ -1,279 +0,0 @@
-- 预估耗时单位:分钟 → 小时
-- 适用表:biz_process、biz_process_route_step、biz_production_task_step
-- 执行前请先备份,并用下方预检语句确认数据格式。
--
-- 生产预检样例(2026-06):biz_production_task_step 存在 '6h'(5 条),
-- 属「已是小时、仅去单位后缀」,不可 ÷60。
--
-- 迁移规则:
-- 1) 纯数字(如 30、480) → ÷60,视为原分钟值
-- 2) 带 h/小时(如 6h、2.5 小时) → 去掉单位,数值不变
-- 3) 带 min/分钟(如 30min) → 去掉单位后 ÷60
-- 4) 其它格式 → 不自动处理,需人工核对
-- ---------- 预检:迁移前查看当前值(只读,可直接执行)----------
-- 注意:biz_production_task_step 与其它两表 collation 可能不一致,UNION 时需显式 COLLATE
-- A. 三表汇总:各值、条数、迁移动作、迁移后预览(小时)
SELECT
src_table,
estimated_duration,
row_cnt,
CASE
WHEN estimated_duration REGEXP '^[0-9]+(\\.[0-9]+)?$' THEN '会换算(÷60)' COLLATE utf8mb4_unicode_ci
WHEN LOWER(TRIM(estimated_duration)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(h|小时)$' THEN '规范化(去h)' COLLATE utf8mb4_unicode_ci
WHEN LOWER(TRIM(estimated_duration)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(min|分钟)$' THEN '会换算(去min÷60)' COLLATE utf8mb4_unicode_ci
ELSE '跳过(需人工)' COLLATE utf8mb4_unicode_ci
END AS migrate_action,
CASE
WHEN estimated_duration REGEXP '^[0-9]+(\\.[0-9]+)?$' THEN TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(CAST(estimated_duration AS DECIMAL(12, 4)) / 60 AS CHAR)
)
)
WHEN LOWER(TRIM(estimated_duration)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(h|小时)$' THEN TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(estimated_duration)), '小时', ''), 'h', '')
) AS DECIMAL(12, 4)
) AS CHAR
)
)
)
WHEN LOWER(TRIM(estimated_duration)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(min|分钟)$' THEN TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(estimated_duration)), '分钟', ''), 'min', '')
) AS DECIMAL(12, 4)
) / 60 AS CHAR
)
)
)
ELSE NULL
END AS after_migration_h
FROM (
SELECT 'biz_process' COLLATE utf8mb4_unicode_ci AS src_table,
estimated_duration COLLATE utf8mb4_unicode_ci AS estimated_duration,
COUNT(*) AS row_cnt
FROM biz_process
WHERE del_flag = 0 AND estimated_duration IS NOT NULL AND estimated_duration != ''
GROUP BY estimated_duration
UNION ALL
SELECT 'biz_process_route_step' COLLATE utf8mb4_unicode_ci,
estimated_duration COLLATE utf8mb4_unicode_ci,
COUNT(*)
FROM biz_process_route_step
WHERE del_flag = 0 AND estimated_duration IS NOT NULL AND estimated_duration != ''
GROUP BY estimated_duration
UNION ALL
SELECT 'biz_production_task_step' COLLATE utf8mb4_unicode_ci,
estimated_duration COLLATE utf8mb4_unicode_ci,
COUNT(*)
FROM biz_production_task_step
WHERE del_flag = 0 AND estimated_duration IS NOT NULL AND estimated_duration != ''
GROUP BY estimated_duration
) t
ORDER BY src_table, row_cnt DESC, estimated_duration;
-- B. 明细:带工序代码/名称,便于逐条核对
SELECT 'biz_process' COLLATE utf8mb4_unicode_ci AS src_table,
id COLLATE utf8mb4_unicode_ci AS id,
process_code COLLATE utf8mb4_unicode_ci AS process_code,
process_name COLLATE utf8mb4_unicode_ci AS process_name,
estimated_duration COLLATE utf8mb4_unicode_ci AS estimated_duration
FROM biz_process
WHERE del_flag = 0 AND estimated_duration IS NOT NULL AND estimated_duration != ''
UNION ALL
SELECT 'biz_process_route_step' COLLATE utf8mb4_unicode_ci,
id COLLATE utf8mb4_unicode_ci,
process_code COLLATE utf8mb4_unicode_ci,
process_name COLLATE utf8mb4_unicode_ci,
estimated_duration COLLATE utf8mb4_unicode_ci
FROM biz_process_route_step
WHERE del_flag = 0 AND estimated_duration IS NOT NULL AND estimated_duration != ''
UNION ALL
SELECT 'biz_production_task_step' COLLATE utf8mb4_unicode_ci,
id COLLATE utf8mb4_unicode_ci,
process_code COLLATE utf8mb4_unicode_ci,
process_name COLLATE utf8mb4_unicode_ci,
estimated_duration COLLATE utf8mb4_unicode_ci
FROM biz_production_task_step
WHERE del_flag = 0 AND estimated_duration IS NOT NULL AND estimated_duration != ''
ORDER BY src_table, process_code, id;
-- ---------- 迁移(确认预检结果后再执行下方 UPDATE)----------
-- 每张表按 ①纯数字÷60 → ②去min÷60 → ③去h 顺序执行
-- biz_process
UPDATE `biz_process`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(CAST(`estimated_duration` AS DECIMAL(12, 4)) / 60 AS CHAR)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND `estimated_duration` REGEXP '^[0-9]+(\\.[0-9]+)?$';
UPDATE `biz_process`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(`estimated_duration`)), '分钟', ''), 'min', '')
) AS DECIMAL(12, 4)
) / 60 AS CHAR
)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND LOWER(TRIM(`estimated_duration`)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(min|分钟)$';
UPDATE `biz_process`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(`estimated_duration`)), '小时', ''), 'h', '')
) AS DECIMAL(12, 4)
) AS CHAR
)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND LOWER(TRIM(`estimated_duration`)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(h|小时)$';
-- biz_process_route_step
UPDATE `biz_process_route_step`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(CAST(`estimated_duration` AS DECIMAL(12, 4)) / 60 AS CHAR)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND `estimated_duration` REGEXP '^[0-9]+(\\.[0-9]+)?$';
UPDATE `biz_process_route_step`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(`estimated_duration`)), '分钟', ''), 'min', '')
) AS DECIMAL(12, 4)
) / 60 AS CHAR
)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND LOWER(TRIM(`estimated_duration`)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(min|分钟)$';
UPDATE `biz_process_route_step`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(`estimated_duration`)), '小时', ''), 'h', '')
) AS DECIMAL(12, 4)
) AS CHAR
)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND LOWER(TRIM(`estimated_duration`)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(h|小时)$';
-- biz_production_task_step(生产环境存在 6h 等值,走第 3 步「去h」)
UPDATE `biz_production_task_step`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(CAST(`estimated_duration` AS DECIMAL(12, 4)) / 60 AS CHAR)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND `estimated_duration` REGEXP '^[0-9]+(\\.[0-9]+)?$';
UPDATE `biz_production_task_step`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(`estimated_duration`)), '分钟', ''), 'min', '')
) AS DECIMAL(12, 4)
) / 60 AS CHAR
)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND LOWER(TRIM(`estimated_duration`)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(min|分钟)$';
UPDATE `biz_production_task_step`
SET `estimated_duration` = TRIM(
TRAILING '.'
FROM TRIM(
TRAILING '0'
FROM CAST(
CAST(
TRIM(
REPLACE(REPLACE(LOWER(TRIM(`estimated_duration`)), '小时', ''), 'h', '')
) AS DECIMAL(12, 4)
) AS CHAR
)
)
)
WHERE `del_flag` = 0
AND `estimated_duration` IS NOT NULL
AND `estimated_duration` != ''
AND LOWER(TRIM(`estimated_duration`)) REGEXP '^[0-9]+(\\.[0-9]+)?\\s*(h|小时)$';
-- 列注释同步(可选,与语义一致)
ALTER TABLE `biz_process`
MODIFY COLUMN `estimated_duration` varchar(100) DEFAULT NULL COMMENT '预估耗时(小时)';
ALTER TABLE `biz_process_route_step`
MODIFY COLUMN `estimated_duration` varchar(100) DEFAULT NULL COMMENT '预估耗时(小时)';
ALTER TABLE `biz_production_task_step`
MODIFY COLUMN `estimated_duration` varchar(100) DEFAULT NULL COMMENT '预估耗时(小时)';
@@ -1,5 +0,0 @@
-- 市场物料变动记录:入库/出库/废弃经办人
-- 2026-07-01
ALTER TABLE `biz_material_usage`
ADD COLUMN `operator_name` varchar(100) DEFAULT NULL COMMENT '经办人姓名' AFTER `receiver`;
@@ -1,6 +0,0 @@
-- 采集协议单:知情同意书、孕妇健康调查表附件字段
-- 2026-07-13
ALTER TABLE `biz_collection_protocol`
ADD COLUMN `consent_form_urls` varchar(4000) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '知情同意书附件URL(逗号分隔)' AFTER `protocol_attachments`,
ADD COLUMN `health_survey_form_urls` varchar(4000) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '孕妇健康调查表附件URL(逗号分隔)' AFTER `consent_form_urls`;
-29
View File
@@ -1,29 +0,0 @@
-- 协议作废类型(采集协议单 / 捐赠协议单)
-- 2026-07-01
ALTER TABLE `biz_collection_protocol`
ADD COLUMN `void_type` varchar(32) DEFAULT NULL COMMENT '协议作废类型(字典 xyzflx)' AFTER `void_desc`;
ALTER TABLE `biz_research_donation`
ADD COLUMN `void_type` varchar(32) DEFAULT NULL COMMENT '作废类型(字典 xyzflx)' AFTER `void_desc`;
INSERT INTO `sys_dict_type` (
`id`, `dict_name`, `dict_type`, `tenant_no`, `order_num`, `remark`,
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
) VALUES (
'TDP000000000000000000000000000096', '协议作废类型', 'xyzflx', 'zkxw', 0, NULL,
NULL, '', NOW(), NULL, NOW(), 0
);
INSERT INTO `sys_dict_data` (
`id`, `dict_label`, `dict_value`, `dict_type`, `tenant_no`, `order_num`, `remark`,
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
) VALUES
(
'DDP000000000000000000000000000201', '客户毁存', 'khhc', 'xyzflx', 'zkxw', 1, NULL,
NULL, '', NOW(), NULL, NOW(), 0
),
(
'DDP000000000000000000000000000202', '检测不合格', 'jcbhg', 'xyzflx', 'zkxw', 2, NULL,
NULL, '', NOW(), NULL, NOW(), 0
);
@@ -1,82 +0,0 @@
-- 质检物料金额查看授权:专用角色 + viewAmount 按钮菜单 + 授权管理页
-- 2026-07-13
-- 1. 按钮权限(F,visible=0,仅用于权限解析)
INSERT INTO `sys_menu`
(`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
VALUES
('95100000000000000000000000000002', '查看质检物料金额', '70000000000000000000000000000009', 'F', '', NULL, 'biz:qcMaterial:viewAmount', 1, '0', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
('95100000000000000000000000000003', '查看我的物料领用金额', '92000000000000000000000000000001', 'F', '', NULL, 'biz:myQcMaterialUsage:viewAmount', 1, '0', '1', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0)
ON DUPLICATE KEY UPDATE
`menu_name` = VALUES(`menu_name`),
`parent_id` = VALUES(`parent_id`),
`menu_type` = VALUES(`menu_type`),
`perms` = VALUES(`perms`),
`visible` = VALUES(`visible`),
`status` = VALUES(`status`),
`del_flag` = 0;
-- 2. 授权管理页(C,挂在质检基础信息下)
INSERT INTO `sys_menu`
(`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`, `is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
VALUES
('95100000000000000000000000000001', '质检物料金额查看授权', 'QCB00000000000000000000000000001', 'C', 'qc-material-amount-auth', '/quality-inspection/qc-material-amount-auth/index', 'biz:qcMaterialAmountAuth:list', 1, '1', '1', 'zkxw', 10, NULL, NULL, '', NOW(), NULL, NOW(), 0)
ON DUPLICATE KEY UPDATE
`menu_name` = VALUES(`menu_name`),
`parent_id` = VALUES(`parent_id`),
`menu_type` = VALUES(`menu_type`),
`path` = VALUES(`path`),
`component` = VALUES(`component`),
`perms` = VALUES(`perms`),
`visible` = VALUES(`visible`),
`status` = VALUES(`status`),
`order_num` = VALUES(`order_num`),
`del_flag` = 0;
-- 3. 专用角色
INSERT INTO `sys_role`
(`id`, `role_name`, `data_scope`, `status`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
VALUES
('ROLE000000000000000000000000000011', '质检物料金额查看', '1', '1', 'zkxw', 0, '可查看/编辑质检物料库与我的物料领用记录中的单价与金额', NULL, '', NOW(), NULL, NOW(), 0)
ON DUPLICATE KEY UPDATE
`role_name` = VALUES(`role_name`),
`status` = VALUES(`status`),
`remark` = VALUES(`remark`),
`del_flag` = 0;
-- 4. 角色 ↔ 按钮权限
INSERT INTO `sys_role_menu`
(`id`, `role_id`, `menu_id`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
VALUES
('RM000000000000000000000000000011', 'ROLE000000000000000000000000000011', '95100000000000000000000000000002', 'zkxw', 1, NULL, NULL, '', NOW(), NULL, NOW(), 0),
('RM000000000000000000000000000012', 'ROLE000000000000000000000000000011', '95100000000000000000000000000003', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0)
ON DUPLICATE KEY UPDATE
`del_flag` = 0;
-- 5. 已拥有「质检物料库」菜单的角色,自动获得授权管理页
INSERT INTO `sys_role_menu`
(`id`, `role_id`, `menu_id`, `tenant_no`, `order_num`, `remark`, `create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`)
SELECT
CONCAT('RMAA', SUBSTRING(MD5(CONCAT(rm.role_id, '95100000000000000000000000000001')), 1, 28)),
rm.role_id,
'95100000000000000000000000000001',
'zkxw',
0,
NULL,
NULL,
'',
NOW(),
NULL,
NOW(),
0
FROM `sys_role_menu` rm
WHERE rm.menu_id = '70000000000000000000000000000009'
AND rm.del_flag = 0
AND rm.tenant_no = 'zkxw'
AND NOT EXISTS (
SELECT 1
FROM `sys_role_menu` x
WHERE x.role_id = rm.role_id
AND x.menu_id = '95100000000000000000000000000001'
AND x.del_flag = 0
);
-10
View File
@@ -1,10 +0,0 @@
-- 样本特殊标记与特殊说明
-- 2026-07-01
ALTER TABLE `biz_protocol_sample`
ADD COLUMN `is_special` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否特殊样本:0否 1是' AFTER `storage_expire_date`,
ADD COLUMN `special_remark` varchar(256) DEFAULT NULL COMMENT '特殊说明' AFTER `is_special`;
ALTER TABLE `biz_research_donation_sample`
ADD COLUMN `is_special` tinyint(4) NOT NULL DEFAULT 0 COMMENT '是否特殊样本:0否 1是' AFTER `storage_expire_date`,
ADD COLUMN `special_remark` varchar(256) DEFAULT NULL COMMENT '特殊说明' AFTER `is_special`;
+196
View File
@@ -0,0 +1,196 @@
-- OA 审批(钉钉交互)增量脚本 — 2026-07-14
-- 执行前请备份;可重复执行时注意 IGNORE 语义(部分语句非幂等)
-- ---------------------------------------------------------------------------
-- 1. 组织字段:直属主管 / 部门负责人用户 ID
-- ---------------------------------------------------------------------------
ALTER TABLE sys_user
ADD COLUMN supervisor_user_id VARCHAR(64) NULL COMMENT '直属主管用户ID' AFTER dept_id;
ALTER TABLE sys_dept
ADD COLUMN leader_user_id VARCHAR(64) NULL COMMENT '部门负责人用户ID' AFTER status;
-- ---------------------------------------------------------------------------
-- 2. OA 审批核心表
-- ---------------------------------------------------------------------------
CREATE TABLE IF NOT EXISTS oa_app_group (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
group_name VARCHAR(100) NOT NULL COMMENT '分组名称',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_app_group_tenant (tenant_no, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA审批分组';
CREATE TABLE IF NOT EXISTS oa_app (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
group_id VARCHAR(64) NULL COMMENT '分组ID',
app_name VARCHAR(50) NOT NULL COMMENT '表单/应用名称',
icon_url VARCHAR(512) NULL COMMENT '图标',
description VARCHAR(100) NULL COMMENT '表单说明',
initiator_scope VARCHAR(32) NOT NULL DEFAULT 'all' COMMENT '发起范围 all/users',
initiator_user_ids TEXT NULL COMMENT '指定发起人JSON数组',
admin_scope VARCHAR(32) NOT NULL DEFAULT 'all_oa_admin' COMMENT '管理员范围',
admin_user_ids TEXT NULL COMMENT '指定管理员JSON数组',
status CHAR(1) NOT NULL DEFAULT '1' COMMENT '1启用 0停用',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_app_tenant (tenant_no, del_flag),
KEY idx_oa_app_group (group_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA审批应用';
CREATE TABLE IF NOT EXISTS oa_app_version (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
app_id VARCHAR(64) NOT NULL COMMENT '应用ID',
version_no INT NOT NULL COMMENT '版本号',
status VARCHAR(16) NOT NULL DEFAULT 'draft' COMMENT 'draft/published',
is_latest_published CHAR(1) NOT NULL DEFAULT '0' COMMENT '是否最新已发布',
form_schema_json LONGTEXT NULL COMMENT '表单Schema JSON',
flow_tree_json LONGTEXT NULL COMMENT '流程树 JSON',
advanced_settings_json TEXT NULL COMMENT '高级设置 JSON',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_app_ver_app (app_id, status, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA审批应用版本';
CREATE TABLE IF NOT EXISTS oa_role (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
role_name VARCHAR(100) NOT NULL COMMENT '角色名称',
role_code VARCHAR(64) NOT NULL COMMENT '角色编码',
role_kind VARCHAR(16) NOT NULL DEFAULT 'custom' COMMENT 'custom/preset',
status CHAR(1) NOT NULL DEFAULT '1' COMMENT '1启用 0停用',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
UNIQUE KEY uk_oa_role_tenant_code (tenant_no, role_code, del_flag),
KEY idx_oa_role_tenant (tenant_no, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA工作流角色';
CREATE TABLE IF NOT EXISTS oa_role_user (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
oa_role_id VARCHAR(64) NOT NULL COMMENT '工作流角色ID',
user_id VARCHAR(64) NOT NULL COMMENT '用户ID',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_role_user_role (oa_role_id, del_flag),
KEY idx_oa_role_user_user (user_id, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA工作流角色成员';
CREATE TABLE IF NOT EXISTS oa_instance (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
app_id VARCHAR(64) NOT NULL COMMENT '应用ID',
app_version_id VARCHAR(64) NOT NULL COMMENT '锁定的已发布版本ID',
title VARCHAR(200) NULL COMMENT '实例标题',
initiator_user_id VARCHAR(64) NOT NULL COMMENT '发起人',
initiator_dept_id VARCHAR(64) NULL COMMENT '发起人部门',
form_data_json LONGTEXT NULL COMMENT '表单数据 JSON',
status VARCHAR(32) NOT NULL DEFAULT 'running' COMMENT 'running/completed/rejected/cancelled',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_inst_tenant (tenant_no, del_flag),
KEY idx_oa_inst_initiator (initiator_user_id, status),
KEY idx_oa_inst_app (app_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA审批实例';
CREATE TABLE IF NOT EXISTS oa_task (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
instance_id VARCHAR(64) NOT NULL COMMENT '实例ID',
node_key VARCHAR(64) NULL COMMENT '节点key',
node_name VARCHAR(200) NULL COMMENT '节点名称',
task_type VARCHAR(16) NOT NULL DEFAULT 'approval' COMMENT 'approval/cc',
assignee_user_id VARCHAR(64) NOT NULL COMMENT '处理人',
status VARCHAR(32) NOT NULL DEFAULT 'pending' COMMENT 'pending/approved/rejected/done',
comment_text VARCHAR(512) NULL COMMENT '意见',
resolve_source VARCHAR(64) NULL COMMENT '解析来源如 supervisor_fallback_dept_leader',
sign_mode VARCHAR(8) NULL COMMENT 'or/and',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_task_assignee (assignee_user_id, status, del_flag),
KEY idx_oa_task_instance (instance_id, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA审批任务';
CREATE TABLE IF NOT EXISTS oa_relation (
id VARCHAR(64) NOT NULL COMMENT '主键ID',
from_instance_id VARCHAR(64) NOT NULL COMMENT '本实例ID',
to_instance_id VARCHAR(64) NOT NULL COMMENT '被关联实例ID',
field_key VARCHAR(64) NULL COMMENT '表单字段key',
tenant_no VARCHAR(64) NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
order_num INT NULL COMMENT '排序号',
remark VARCHAR(512) NULL COMMENT '备注',
create_by VARCHAR(64) NULL COMMENT '创建人id',
create_dept_id VARCHAR(64) NOT NULL DEFAULT '' COMMENT '创建人部门ID',
create_time DATETIME NOT NULL COMMENT '创建时间',
update_by VARCHAR(64) NULL COMMENT '更新人id',
update_time DATETIME NOT NULL COMMENT '更新时间',
del_flag SMALLINT NOT NULL DEFAULT 0 COMMENT '删除标记',
PRIMARY KEY (id),
KEY idx_oa_rel_from (from_instance_id, del_flag)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COMMENT='OA关联审批';
-- 预置工作流角色(按租户手工或应用启动 ensure;此处示例 zkxw)
-- INSERT 由后端 ensure_presets 幂等完成,避免 UUID 硬编码冲突
-- ---------------------------------------------------------------------------
-- 3. 菜单说明
-- ---------------------------------------------------------------------------
-- 侧栏路由已写入:
-- - web-admin/src/router/modules/sqxp.ts
-- - backend/app/api/menu.py(STATIC_MENU_TREE)
-- 角色权限用的 sys_menu 注册见:
-- docs/sql/patch_2026-07-15_oa_approval_sys_menu.sql
-- (含 OA审批 节点插入,以及旧「工作流管理」伪删除)
@@ -0,0 +1,158 @@
-- =============================================================================
-- OA 审批菜单注册 + 旧「工作流管理」伪删除
-- 日期:2026-07-15
-- 说明:
-- 1. 在「系统管理」顶级(TOP...00005)下注册「OA审批」及三级页面菜单,
-- id / path / component / perms 与 web-admin sqxp.ts、backend menu.py 对齐。
-- 2. 伪删除旧「工作流管理」二级及其三级菜单(OA 已替代),并清理角色菜单关联。
-- =============================================================================
SET NAMES utf8mb4;
-- ---------------------------------------------------------------------------
-- 1. 伪删除旧「工作流管理」及其子菜单
-- ---------------------------------------------------------------------------
UPDATE `sys_menu`
SET `del_flag` = 1,
`update_time` = NOW()
WHERE `del_flag` = 0
AND (
`id` = 'WKF00000000000000000000000000001'
OR `parent_id` = 'WKF00000000000000000000000000001'
OR `id` IN (
'10000000000000000000000000000wf01',
'10000000000000000000000000000wf02',
'10000000000000000000000000000wf03',
'10000000000000000000000000000wf04',
'10000000000000000000000000000wf05'
)
);
DELETE FROM `sys_role_menu`
WHERE `menu_id` IN (
'WKF00000000000000000000000000001',
'10000000000000000000000000000wf01',
'10000000000000000000000000000wf02',
'10000000000000000000000000000wf03',
'10000000000000000000000000000wf04',
'10000000000000000000000000000wf05'
);
-- ---------------------------------------------------------------------------
-- 2. 注册「OA审批」二级目录(挂在系统管理顶级下)
-- ---------------------------------------------------------------------------
INSERT INTO `sys_menu` (
`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`,
`is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`,
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
)
SELECT
'OA000000000000000000000000000001', 'OA审批', 'TOP00000000000000000000000000005', 'M',
'oa-approval', NULL, NULL,
1, '1', '1', 'zkxw', 2, '钉钉式 OA 审批(替代旧工作流管理)',
NULL, '', NOW(), NULL, NOW(), 0
FROM DUAL
WHERE NOT EXISTS (
SELECT 1 FROM `sys_menu` WHERE `id` = 'OA000000000000000000000000000001'
);
-- 若曾假删过同 id,则恢复
UPDATE `sys_menu`
SET `del_flag` = 0,
`menu_name` = 'OA审批',
`parent_id` = 'TOP00000000000000000000000000005',
`menu_type` = 'M',
`path` = 'oa-approval',
`component` = NULL,
`perms` = NULL,
`visible` = '1',
`status` = '1',
`order_num` = 2,
`update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000001';
-- ---------------------------------------------------------------------------
-- 3. 注册 OA 三级菜单(可见页 + 隐藏详情/设计页)
-- ---------------------------------------------------------------------------
INSERT INTO `sys_menu` (
`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`,
`is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`,
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
)
SELECT * FROM (
SELECT 'OA000000000000000000000000000101' AS id, '审批管理' AS menu_name,
'OA000000000000000000000000000001' AS parent_id, 'C' AS menu_type,
'apps' AS path, '/oa-approval/apps/index' AS component, 'oa:apps:list' AS perms,
1 AS is_frame, '1' AS visible, '1' AS status, 'zkxw' AS tenant_no, 1 AS order_num,
NULL AS remark, NULL AS create_by, '' AS create_dept_id, NOW() AS create_time,
NULL AS update_by, NOW() AS update_time, 0 AS del_flag
UNION ALL
SELECT 'OA000000000000000000000000000102', '工作流角色',
'OA000000000000000000000000000001', 'C',
'roles', '/oa-approval/roles/index', 'oa:roles:list',
1, '1', '1', 'zkxw', 2, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000103', '发起审批',
'OA000000000000000000000000000001', 'C',
'start', '/oa-approval/start/index', 'oa:start',
1, '1', '1', 'zkxw', 3, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000104', '待办中心',
'OA000000000000000000000000000001', 'C',
'pending', '/oa-approval/pending/index', 'oa:pending',
1, '1', '1', 'zkxw', 4, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000105', '已办中心',
'OA000000000000000000000000000001', 'C',
'done', '/oa-approval/done/index', 'oa:done',
1, '1', '1', 'zkxw', 5, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000106', '我发起的',
'OA000000000000000000000000000001', 'C',
'mine', '/oa-approval/mine/index', 'oa:mine',
1, '1', '1', 'zkxw', 6, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000107', '抄送我的',
'OA000000000000000000000000000001', 'C',
'cc', '/oa-approval/cc/index', 'oa:cc',
1, '1', '1', 'zkxw', 7, NULL, NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000201', '审批设计',
'OA000000000000000000000000000001', 'C',
'designer/:id', '/oa-approval/designer/index', 'oa:designer',
1, '0', '1', 'zkxw', 8, '隐藏页:从审批管理进入', NULL, '', NOW(), NULL, NOW(), 0
UNION ALL
SELECT 'OA000000000000000000000000000202', '审批详情',
'OA000000000000000000000000000001', 'C',
'instances/:id', '/oa-approval/instances/detail', 'oa:instance:detail',
1, '0', '1', 'zkxw', 9, '隐藏页:从任务/列表进入', NULL, '', NOW(), NULL, NOW(), 0
) AS t
WHERE NOT EXISTS (
SELECT 1 FROM `sys_menu` m WHERE m.`id` = t.id
);
-- 幂等:已存在则同步字段并取消伪删除
UPDATE `sys_menu` m
JOIN (
SELECT 'OA000000000000000000000000000101' AS id, '审批管理' AS menu_name, 'apps' AS path,
'/oa-approval/apps/index' AS component, 'oa:apps:list' AS perms, '1' AS visible, 1 AS order_num
UNION ALL SELECT 'OA000000000000000000000000000102', '工作流角色', 'roles', '/oa-approval/roles/index', 'oa:roles:list', '1', 2
UNION ALL SELECT 'OA000000000000000000000000000103', '发起审批', 'start', '/oa-approval/start/index', 'oa:start', '1', 3
UNION ALL SELECT 'OA000000000000000000000000000104', '待办中心', 'pending', '/oa-approval/pending/index', 'oa:pending', '1', 4
UNION ALL SELECT 'OA000000000000000000000000000105', '已办中心', 'done', '/oa-approval/done/index', 'oa:done', '1', 5
UNION ALL SELECT 'OA000000000000000000000000000106', '我发起的', 'mine', '/oa-approval/mine/index', 'oa:mine', '1', 6
UNION ALL SELECT 'OA000000000000000000000000000107', '抄送我的', 'cc', '/oa-approval/cc/index', 'oa:cc', '1', 7
UNION ALL SELECT 'OA000000000000000000000000000201', '审批设计', 'designer/:id', '/oa-approval/designer/index', 'oa:designer', '0', 8
UNION ALL SELECT 'OA000000000000000000000000000202', '审批详情', 'instances/:id', '/oa-approval/instances/detail', 'oa:instance:detail', '0', 9
) s ON m.id = s.id
SET m.`del_flag` = 0,
m.`parent_id` = 'OA000000000000000000000000000001',
m.`menu_type` = 'C',
m.`menu_name` = s.menu_name,
m.`path` = s.path,
m.`component` = s.component,
m.`perms` = s.perms,
m.`visible` = s.visible,
m.`status` = '1',
m.`order_num` = s.order_num,
m.`update_time` = NOW();
@@ -0,0 +1,14 @@
-- OA 审批菜单重命名:待处理 → 待办中心,已处理 → 已办中心
-- 已执行过 patch_2026-07-15_oa_approval_sys_menu.sql 的环境可单独跑本脚本。
UPDATE `sys_menu`
SET `menu_name` = '待办中心',
`update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000104'
AND `del_flag` = 0;
UPDATE `sys_menu`
SET `menu_name` = '已办中心',
`update_time` = NOW()
WHERE `id` = 'OA000000000000000000000000000105'
AND `del_flag` = 0;