TRKJ/mayfly-go
2
0
Fork 0
mirror of https://gitee.com/dromara/mayfly-go synced 2025-12-25 17:16:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

!106 feat：数据同步支持唯一键冲突策略

Browse Source 
* refactor：sql同步
* fix: 表格右键导出菜单换行符修复
* feat：数据同步支持唯一键冲突策略
This commit is contained in:
zongyangleo
2024-03-01 04:03:03 +00:00
committed by Coder慌
parent f93231da61
commit 76475e807e
38 changed files with 1117 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
server/resources/script/sql/v1.7/v1.7.4.sql
View File

@@ -11,68 +11,68 @@ INSERT INTO t_sys_resource (id, pid, ui_path, `type`, status, name, code, weight
-- 工单流程相关表
CREATE TABLE `t_flow_procdef` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`def_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程定义key',
`name` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '流程名称',
`def_key` varchar(100) NOT NULL COMMENT '流程定义key',
`name` varchar(191) DEFAULT NULL COMMENT '流程名称',
`status` tinyint DEFAULT NULL COMMENT '状态',
`tasks` varchar(3000) COLLATE utf8mb4_bin NOT NULL COMMENT '审批节点任务信息',
`remark` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`remark` varchar(191) DEFAULT NULL,
`create_time` datetime NOT NULL,
`creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`creator` varchar(191) DEFAULT NULL,
`creator_id` bigint NOT NULL,
`update_time` datetime NOT NULL,
`modifier` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`modifier` varchar(191) DEFAULT NULL,
`modifier_id` bigint NOT NULL,
`is_deleted` tinyint DEFAULT '0',
`delete_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`)
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程-流程定义';
) COMMENT='流程-流程定义';
CREATE TABLE `t_flow_procinst` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`procdef_id` bigint NOT NULL COMMENT '流程定义id',
`procdef_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '流程定义名称',
`task_key` varchar(100) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '当前任务key',
`procdef_name` varchar(64) NOT NULL COMMENT '流程定义名称',
`task_key` varchar(100) DEFAULT NULL COMMENT '当前任务key',
`status` tinyint DEFAULT NULL COMMENT '状态',
`biz_type` varchar(64) COLLATE utf8mb4_bin NOT NULL COMMENT '关联业务类型',
`biz_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '关联业务key',
`biz_key` varchar(64) NOT NULL COMMENT '关联业务key',
`biz_status` tinyint DEFAULT NULL COMMENT '业务状态',
`biz_handle_res` varchar(100) COLLATE utf8mb4_bin DEFAULT NULL COMMENT '关联的业务处理结果',
`remark` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`remark` varchar(191) DEFAULT NULL,
`end_time` datetime DEFAULT NULL COMMENT '结束时间',
`duration` bigint DEFAULT NULL COMMENT '流程持续时间（开始到结束）',
`create_time` datetime NOT NULL COMMENT '流程发起时间',
`creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '流程发起人',
`creator` varchar(191) DEFAULT NULL COMMENT '流程发起人',
`creator_id` bigint NOT NULL,
`update_time` datetime NOT NULL,
`modifier` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`modifier` varchar(191) DEFAULT NULL,
`modifier_id` bigint NOT NULL,
`is_deleted` tinyint DEFAULT '0',
`delete_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_procdef_id` (`procdef_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程-流程实例(根据流程定义开启一个流程)';
) COMMENT='流程-流程实例(根据流程定义开启一个流程)';
CREATE TABLE `t_flow_procinst_task` (
`id` bigint unsigned NOT NULL AUTO_INCREMENT,
`procinst_id` bigint NOT NULL COMMENT '流程实例id',
`task_key` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NOT NULL COMMENT '任务key',
`task_name` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '任务名称',
`assignee` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL COMMENT '分配到该任务的用户',
`task_key` varchar(64) NOT NULL COMMENT '任务key',
`task_name` varchar(64) DEFAULT NULL COMMENT '任务名称',
`assignee` varchar(64) DEFAULT NULL COMMENT '分配到该任务的用户',
`status` tinyint DEFAULT NULL COMMENT '状态',
`remark` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`remark` varchar(191) DEFAULT NULL,
`end_time` datetime DEFAULT NULL COMMENT '结束时间',
`duration` bigint DEFAULT NULL COMMENT '任务持续时间（开始到结束）',
`create_time` datetime NOT NULL COMMENT '任务开始时间',
`creator` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`creator` varchar(191) DEFAULT NULL,
`creator_id` bigint NOT NULL,
`update_time` datetime NOT NULL,
`modifier` varchar(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin DEFAULT NULL,
`modifier` varchar(191) DEFAULT NULL,
`modifier_id` bigint NOT NULL,
`is_deleted` tinyint DEFAULT '0',
`delete_time` datetime DEFAULT NULL,
PRIMARY KEY (`id`),
KEY `idx_procinst_id` (`procinst_id`) USING BTREE
) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_bin COMMENT='流程-流程实例任务';
) COMMENT='流程-流程实例任务';
-- 新增工单流程相关字段
ALTER TABLE t_db_sql_exec ADD status tinyint NULL COMMENT '执行状态';
@@ -82,6 +82,9 @@ ALTER TABLE t_db_sql_exec ADD res varchar(1000) NULL COMMENT '执行结果';
ALTER TABLE t_db ADD flow_procdef_key varchar(64) NULL COMMENT '审批流-流程定义key（有值则说明关键操作需要进行审批执行）';
-- 历史执行记录调整为成功状态
UPDATE t_db_sql_exec SET status = 2
UPDATE t_db_sql_exec SET status = 2;
ALTER TABLE `t_db_data_sync_task`
ADD COLUMN `duplicate_strategy` tinyint(1) NULL DEFAULT -1 comment '冲突策略 -1：无，1：忽略，2：覆盖';
commit;