From 789273d0d9af69b36335bbd9d66f0500bd681040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?=
<15040126243@163.com>
Date: Mon, 22 Sep 2025 11:09:00 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"update=20warm-flow=20=E5=8D=87?=
=?UTF-8?q?=E7=BA=A7=201.8.2-m2"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This reverts commit 0fff64da20cfa3733ee2b8e2344b1193886ff6a1.
---
pom.xml | 2 +-
.../service/impl/FlwNodeExtServiceImpl.java | 8 +-
script/sql/oracle/oracle_ry_workflow.sql | 95 +++++++------------
script/sql/postgres/postgres_ry_workflow.sql | 34 ++-----
script/sql/ry-workflow.sql | 15 +--
.../sql/update/oracle/update_2.4.1-2.5.0.sql | 29 ------
.../update/postgres/update_2.4.1-2.5.0.sql | 29 ------
script/sql/update/update_2.4.1-2.5.0.sql | 25 -----
8 files changed, 49 insertions(+), 188 deletions(-)
diff --git a/pom.xml b/pom.xml
index 35e2920fc..ea492a583 100644
--- a/pom.xml
+++ b/pom.xml
@@ -53,7 +53,7 @@
8.7.2-20250603
- 1.8.2-m2
+ 1.8.1
2.3.4
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
index 710e93410..8cb1407d5 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/FlwNodeExtServiceImpl.java
@@ -46,7 +46,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
CopySettingEnum.class.getSimpleName(),
Map.of(
"label", "抄送对象",
- "type", 5,
+ "type", 2,
"must", false,
"multiple", false,
"desc", "设置该节点的抄送办理人"
@@ -57,7 +57,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
"type", 2,
"must", false,
"multiple", false,
- "desc", "节点执行时可设置自定义参数，多个参数以逗号分隔，如：key1=value1,key2=value2"
+ "desc", "节点执行时可以使用的自定义参数"
),
ButtonPermissionEnum.class.getSimpleName(),
Map.of(
@@ -139,7 +139,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
childNode.setCode(simpleName);
// label名称
childNode.setLabel(Convert.toStr(map.get("label")));
- // 1：输入框 2：文本域 3：下拉框 4：选择框 5：用户选择器
+ // 1：输入框 2：文本域 3：下拉框 4：选择框
childNode.setType(Convert.toInt(map.get("type"), 1));
// 是否必填
childNode.setMust(Convert.toBool(map.get("must"), false));
@@ -172,7 +172,7 @@ public class FlwNodeExtServiceImpl implements NodeExtService, IFlwNodeExtService
childNode.setCode(dictType);
// label名称
childNode.setLabel(dictTypeDTO.getDictName());
- // 1：输入框 2：文本域 3：下拉框 4：选择框 5：用户选择器
+ // 1：输入框 2：文本域 3：下拉框 4：选择框
childNode.setType(3);
// 是否必填
childNode.setMust(false);
diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql
index 503bc88b4..a56aa5b5f 100644
--- a/script/sql/oracle/oracle_ry_workflow.sql
+++ b/script/sql/oracle/oracle_ry_workflow.sql
@@ -17,9 +17,7 @@ create table FLOW_DEFINITION
LISTENER_PATH VARCHAR2(500),
EXT VARCHAR2(500),
CREATE_TIME DATE,
- CREATE_BY VARCHAR2(64) default '',
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40)
);
@@ -42,9 +40,7 @@ comment on column FLOW_DEFINITION.LISTENER_TYPE is '监听器类型';
comment on column FLOW_DEFINITION.LISTENER_PATH is '监听器路径';
comment on column FLOW_DEFINITION.EXT is '扩展字段，预留给业务系统使用';
comment on column FLOW_DEFINITION.CREATE_TIME is '创建时间';
-comment on column FLOW_DEFINITION.CREATE_BY is '创建人';
comment on column FLOW_DEFINITION.UPDATE_TIME is '更新时间';
-comment on column FLOW_DEFINITION.UPDATE_BY is '更新人';
comment on column FLOW_DEFINITION.DEL_FLAG is '删除标志';
comment on column FLOW_DEFINITION.TENANT_ID is '租户id';
@@ -66,9 +62,7 @@ create table FLOW_NODE
FORM_PATH VARCHAR2(100),
VERSION VARCHAR2(20),
CREATE_TIME DATE,
- CREATE_BY VARCHAR2(64) default '',
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
EXT CLOB,
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40),
@@ -95,9 +89,7 @@ comment on column FLOW_NODE.FORM_CUSTOM is '审批表单是否自定义 (Y是 N
comment on column FLOW_NODE.FORM_PATH is '审批表单路径';
comment on column FLOW_NODE.VERSION is '版本';
comment on column FLOW_NODE.CREATE_TIME is '创建时间';
-comment on column FLOW_NODE.CREATE_BY is '创建人';
comment on column FLOW_NODE.UPDATE_TIME is '更新时间';
-comment on column FLOW_NODE.UPDATE_BY is '更新人';
comment on column FLOW_NODE.EXT is '节点扩展属性';
comment on column FLOW_NODE.DEL_FLAG is '删除标志';
comment on column FLOW_NODE.TENANT_ID is '租户id';
@@ -116,9 +108,7 @@ create table FLOW_SKIP
SKIP_CONDITION VARCHAR2(200),
COORDINATE VARCHAR2(100),
CREATE_TIME DATE,
- CREATE_BY VARCHAR2(64) default '',
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40)
);
@@ -138,9 +128,7 @@ comment on column FLOW_SKIP.SKIP_TYPE is '跳转类型 (PASS审批通过 REJECT
comment on column FLOW_SKIP.SKIP_CONDITION is '跳转条件';
comment on column FLOW_SKIP.COORDINATE is '坐标';
comment on column FLOW_SKIP.CREATE_TIME is '创建时间';
-comment on column FLOW_SKIP.CREATE_BY is '创建人';
comment on column FLOW_SKIP.UPDATE_TIME is '更新时间';
-comment on column FLOW_SKIP.UPDATE_BY is '更新人';
comment on column FLOW_SKIP.DEL_FLAG is '删除标志';
comment on column FLOW_SKIP.TENANT_ID is '租户id';
@@ -156,10 +144,9 @@ create table FLOW_INSTANCE
FLOW_STATUS VARCHAR2(20),
ACTIVITY_STATUS NUMBER(1) default 1,
DEF_JSON CLOB,
- CREATE_TIME DATE,
CREATE_BY VARCHAR2(64) default '',
+ CREATE_TIME DATE,
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
EXT VARCHAR2(500),
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40)
@@ -181,9 +168,7 @@ comment on column FLOW_INSTANCE.ACTIVITY_STATUS is '流程激活状态（0挂起
comment on column FLOW_INSTANCE.DEF_JSON is '流程定义json';
comment on column FLOW_INSTANCE.CREATE_BY is '创建者';
comment on column FLOW_INSTANCE.CREATE_TIME is '创建时间';
-comment on column FLOW_INSTANCE.CREATE_BY is '创建人';
comment on column FLOW_INSTANCE.UPDATE_TIME is '更新时间';
-comment on column FLOW_INSTANCE.UPDATE_BY is '更新人';
comment on column FLOW_INSTANCE.EXT is '扩展字段，预留给业务系统使用';
comment on column FLOW_INSTANCE.DEL_FLAG is '删除标志';
comment on column FLOW_INSTANCE.TENANT_ID is '租户id';
@@ -200,9 +185,7 @@ create table FLOW_TASK
FORM_CUSTOM VARCHAR2(1) default 'N',
FORM_PATH VARCHAR2(100),
CREATE_TIME DATE,
- CREATE_BY VARCHAR2(64) default '',
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40)
);
@@ -221,9 +204,7 @@ comment on column FLOW_TASK.FLOW_STATUS is '流程状态（0待提交 1审批中
comment on column FLOW_TASK.FORM_CUSTOM is '审批表单是否自定义 (Y是 N否)';
comment on column FLOW_TASK.FORM_PATH is '审批表单路径';
comment on column FLOW_TASK.CREATE_TIME is '创建时间';
-comment on column FLOW_TASK.CREATE_BY is '创建人';
comment on column FLOW_TASK.UPDATE_TIME is '更新时间';
-comment on column FLOW_TASK.UPDATE_BY is '更新人';
comment on column FLOW_TASK.DEL_FLAG is '删除标志';
comment on column FLOW_TASK.TENANT_ID is '租户id';
@@ -250,7 +231,6 @@ create table FLOW_HIS_TASK
EXT CLOB,
CREATE_TIME DATE,
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40)
@@ -278,10 +258,9 @@ comment on column FLOW_HIS_TASK.VARIABLE is '任务变量';
comment on column FLOW_HIS_TASK.EXT is '扩展字段，预留给业务系统使用';
comment on column FLOW_HIS_TASK.CREATE_TIME is '任务开始时间';
comment on column FLOW_HIS_TASK.UPDATE_TIME is '审批完成时间';
-comment on column FLOW_HIS_TASK.UPDATE_BY is '更新人';
comment on column FLOW_HIS_TASK.DEL_FLAG is '删除标志';
comment on column FLOW_HIS_TASK.TENANT_ID is '租户id';
-comment on column FLOW_HIS_TASK.APPROVER is '审批人';
+comment on column FLOW_HIS_TASK.APPROVER is '审批者';
comment on column FLOW_HIS_TASK.COOPERATE_TYPE is '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)';
comment on column FLOW_HIS_TASK.COLLABORATOR is '协作人';
@@ -294,7 +273,6 @@ create table FLOW_USER
CREATE_TIME DATE,
CREATE_BY VARCHAR2(80),
UPDATE_TIME DATE,
- UPDATE_BY VARCHAR2(64) default '',
DEL_FLAG VARCHAR2(1) default '0',
TENANT_ID VARCHAR2(40)
);
@@ -310,7 +288,6 @@ comment on column FLOW_USER.ASSOCIATED is '任务表id';
comment on column FLOW_USER.CREATE_TIME is '创建时间';
comment on column FLOW_USER.CREATE_BY is '节点名称';
comment on column FLOW_USER.UPDATE_TIME is '更新时间';
-comment on column FLOW_USER.UPDATE_BY is '更新人';
comment on column FLOW_USER.DEL_FLAG is '删除标志';
comment on column FLOW_USER.TENANT_ID is '租户id';
@@ -322,18 +299,18 @@ create index USER_ASSOCIATED_IDX on FLOW_USER (ASSOCIATED);
-- ----------------------------
CREATE TABLE flow_category
(
- category_id NUMBER(20) NOT NULL,
- tenant_id VARCHAR2(20) DEFAULT '000000',
- parent_id NUMBER(20) DEFAULT 0,
- ancestors VARCHAR2(500) DEFAULT '',
- category_name VARCHAR2(30) NOT NULL,
- order_num NUMBER(4) DEFAULT 0,
- del_flag CHAR(1) DEFAULT '0',
- create_dept NUMBER(20),
- create_by NUMBER(20),
- create_time DATE,
- update_by NUMBER(20),
- update_time DATE
+ category_id NUMBER (20) NOT NULL,
+ tenant_id VARCHAR2 (20) DEFAULT '000000',
+ parent_id NUMBER (20) DEFAULT 0,
+ ancestors VARCHAR2 (500) DEFAULT '',
+ category_name VARCHAR2 (30) NOT NULL,
+ order_num NUMBER (4) DEFAULT 0,
+ del_flag CHAR(1) DEFAULT '0',
+ create_dept NUMBER (20),
+ create_by NUMBER (20),
+ create_time DATE,
+ update_by NUMBER (20),
+ update_time DATE
);
alter table flow_category add constraint pk_flow_category primary key (category_id);
@@ -367,19 +344,19 @@ INSERT INTO flow_category VALUES (109, '000000', 102, '0,100,102', '离职', 2,
-- 流程spel表达式定义表
-- ----------------------------
CREATE TABLE flow_spel (
- id NUMBER(20) NOT NULL,
- component_name VARCHAR2(255),
- method_name VARCHAR2(255),
- method_params VARCHAR2(255),
- view_spel VARCHAR2(255),
- remark VARCHAR2(255),
- status CHAR(1) DEFAULT '0',
- del_flag CHAR(1) DEFAULT '0',
- create_dept NUMBER(20),
- create_by NUMBER(20),
- create_time DATE,
- update_by NUMBER(20),
- update_time DATE
+ id NUMBER(20) NOT NULL,
+ component_name VARCHAR2(255),
+ method_name VARCHAR2(255),
+ method_params VARCHAR2(255),
+ view_spel VARCHAR2(255),
+ remark VARCHAR2(255),
+ status CHAR(1) DEFAULT '0',
+ del_flag CHAR(1) DEFAULT '0',
+ create_dept NUMBER(20),
+ create_by NUMBER(20),
+ create_time DATE,
+ update_by NUMBER(20),
+ update_time DATE
);
alter table flow_spel add constraint pk_flow_spel primary key (id);
@@ -441,19 +418,19 @@ COMMENT ON COLUMN flow_instance_biz_ext.business_id IS '业务Id';
-- ----------------------------
CREATE TABLE test_leave
(
- id NUMBER (20) NOT NULL,
- tenant_id VARCHAR2 (20) DEFAULT '000000',
- apply_code VARCHAR2 (50) NOT NULL,
- leave_type VARCHAR2 (255) NOT NULL,
+ id NUMBER (20) NOT NULL,
+ tenant_id VARCHAR2 (20) DEFAULT '000000',
+ apply_code VARCHAR2 (50) NOT NULL,
+ leave_type VARCHAR2 (255) NOT NULL,
start_date DATE NOT NULL,
end_date DATE NOT NULL,
- leave_days NUMBER (10) NOT NULL,
- remark VARCHAR2 (255),
- status VARCHAR2 (255),
+ leave_days NUMBER (10) NOT NULL,
+ remark VARCHAR2 (255),
+ status VARCHAR2 (255),
create_dept NUMBER (20),
- create_by NUMBER (20),
+ create_by NUMBER (20),
create_time DATE,
- update_by NUMBER (20),
+ update_by NUMBER (20),
update_time DATE
);
diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql
index aea419aaf..9ebb4e794 100644
--- a/script/sql/postgres/postgres_ry_workflow.sql
+++ b/script/sql/postgres/postgres_ry_workflow.sql
@@ -14,9 +14,7 @@ CREATE TABLE flow_definition
listener_path varchar(400) NULL,
ext varchar(500) NULL,
create_time timestamp NULL,
- create_by varchar(64) NULL DEFAULT '':: character varying,
update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
CONSTRAINT flow_definition_pkey PRIMARY KEY (id)
@@ -37,9 +35,7 @@ COMMENT ON COLUMN flow_definition.listener_type IS '监听器类型';
COMMENT ON COLUMN flow_definition.listener_path IS '监听器路径';
COMMENT ON COLUMN flow_definition.ext IS '扩展字段，预留给业务系统使用';
COMMENT ON COLUMN flow_definition.create_time IS '创建时间';
-COMMENT ON COLUMN flow_definition.create_by IS '创建人';
COMMENT ON COLUMN flow_definition.update_time IS '更新时间';
-COMMENT ON COLUMN flow_definition.update_by IS '更新人';
COMMENT ON COLUMN flow_definition.del_flag IS '删除标志';
COMMENT ON COLUMN flow_definition.tenant_id IS '租户id';
@@ -61,10 +57,8 @@ CREATE TABLE flow_node
form_custom bpchar(1) NULL DEFAULT 'N':: character varying,
form_path varchar(100) NULL,
"version" varchar(20) NOT NULL,
- create_time timestamp NULL,
- create_by varchar(64) NULL DEFAULT '':: character varying,
- update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
+ create_time timestamp NULL,
+ update_time timestamp NULL,
ext text NULL,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
@@ -89,9 +83,7 @@ COMMENT ON COLUMN flow_node.form_custom IS '审批表单是否自定义（Y是 N
COMMENT ON COLUMN flow_node.form_path IS '审批表单路径';
COMMENT ON COLUMN flow_node."version" IS '版本';
COMMENT ON COLUMN flow_node.create_time IS '创建时间';
-COMMENT ON COLUMN flow_node.create_by IS '创建人';
COMMENT ON COLUMN flow_node.update_time IS '更新时间';
-COMMENT ON COLUMN flow_node.update_by IS '更新人';
COMMENT ON COLUMN flow_node.ext IS '节点扩展属性';
COMMENT ON COLUMN flow_node.del_flag IS '删除标志';
COMMENT ON COLUMN flow_node.tenant_id IS '租户id';
@@ -110,9 +102,7 @@ CREATE TABLE flow_skip
skip_condition varchar(200) NULL,
coordinate varchar(100) NULL,
create_time timestamp NULL,
- create_by varchar(64) NULL DEFAULT '':: character varying,
update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
CONSTRAINT flow_skip_pkey PRIMARY KEY (id)
@@ -130,9 +120,7 @@ COMMENT ON COLUMN flow_skip.skip_type IS '跳转类型（PASS审批通过 REJECT
COMMENT ON COLUMN flow_skip.skip_condition IS '跳转条件';
COMMENT ON COLUMN flow_skip.coordinate IS '坐标';
COMMENT ON COLUMN flow_skip.create_time IS '创建时间';
-COMMENT ON COLUMN flow_skip.create_by IS '创建人';
COMMENT ON COLUMN flow_skip.update_time IS '更新时间';
-COMMENT ON COLUMN flow_skip.update_by IS '更新人';
COMMENT ON COLUMN flow_skip.del_flag IS '删除标志';
COMMENT ON COLUMN flow_skip.tenant_id IS '租户id';
@@ -148,10 +136,9 @@ CREATE TABLE flow_instance
flow_status varchar(20) NOT NULL,
activity_status int2 NOT NULL DEFAULT 1,
def_json text NULL,
+ create_by varchar(64) NULL DEFAULT '':: character varying,
create_time timestamp NULL,
- create_by varchar(64) NULL DEFAULT '':: character varying,
update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
ext varchar(500) NULL,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
@@ -169,10 +156,9 @@ COMMENT ON COLUMN flow_instance.variable IS '任务变量';
COMMENT ON COLUMN flow_instance.flow_status IS '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）';
COMMENT ON COLUMN flow_instance.activity_status IS '流程激活状态（0挂起 1激活）';
COMMENT ON COLUMN flow_instance.def_json IS '流程定义json';
+COMMENT ON COLUMN flow_instance.create_by IS '创建者';
COMMENT ON COLUMN flow_instance.create_time IS '创建时间';
-COMMENT ON COLUMN flow_instance.create_by IS '创建人';
COMMENT ON COLUMN flow_instance.update_time IS '更新时间';
-COMMENT ON COLUMN flow_instance.update_by IS '更新人';
COMMENT ON COLUMN flow_instance.ext IS '扩展字段，预留给业务系统使用';
COMMENT ON COLUMN flow_instance.del_flag IS '删除标志';
COMMENT ON COLUMN flow_instance.tenant_id IS '租户id';
@@ -185,13 +171,11 @@ CREATE TABLE flow_task
node_code varchar(100) NOT NULL,
node_name varchar(100) NULL,
node_type int2 NOT NULL,
- flow_status varchar(20) NOT NULL,
+ flow_status varchar(20) NOT NULL,
form_custom bpchar(1) NULL DEFAULT 'N':: character varying,
form_path varchar(100) NULL,
create_time timestamp NULL,
- create_by varchar(64) NULL DEFAULT '':: character varying,
update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
CONSTRAINT flow_task_pkey PRIMARY KEY (id)
@@ -208,9 +192,7 @@ COMMENT ON COLUMN flow_task.flow_status IS '流程状态（0待提交 1审批中
COMMENT ON COLUMN flow_task.form_custom IS '审批表单是否自定义（Y是 N否）';
COMMENT ON COLUMN flow_task.form_path IS '审批表单路径';
COMMENT ON COLUMN flow_task.create_time IS '创建时间';
-COMMENT ON COLUMN flow_task.create_by IS '创建人';
COMMENT ON COLUMN flow_task.update_time IS '更新时间';
-COMMENT ON COLUMN flow_task.update_by IS '更新人';
COMMENT ON COLUMN flow_task.del_flag IS '删除标志';
COMMENT ON COLUMN flow_task.tenant_id IS '租户id';
@@ -237,7 +219,6 @@ CREATE TABLE flow_his_task
variable text NULL,
create_time timestamp NULL,
update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
CONSTRAINT flow_his_task_pkey PRIMARY KEY (id)
@@ -253,7 +234,7 @@ COMMENT ON COLUMN flow_his_task.node_name IS '开始节点名称';
COMMENT ON COLUMN flow_his_task.node_type IS '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）';
COMMENT ON COLUMN flow_his_task.target_node_code IS '目标节点编码';
COMMENT ON COLUMN flow_his_task.target_node_name IS '结束节点名称';
-COMMENT ON COLUMN flow_his_task.approver IS '审批人';
+COMMENT ON COLUMN flow_his_task.approver IS '审批者';
COMMENT ON COLUMN flow_his_task.cooperate_type IS '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)';
COMMENT ON COLUMN flow_his_task.collaborator IS '协作人';
COMMENT ON COLUMN flow_his_task.skip_type IS '流转类型（PASS通过 REJECT退回 NONE无动作）';
@@ -265,7 +246,6 @@ COMMENT ON COLUMN flow_his_task.variable IS '任务变量';
COMMENT ON COLUMN flow_his_task.ext IS '扩展字段，预留给业务系统使用';
COMMENT ON COLUMN flow_his_task.create_time IS '任务开始时间';
COMMENT ON COLUMN flow_his_task.update_time IS '审批完成时间';
-COMMENT ON COLUMN flow_his_task.update_by IS '更新人';
COMMENT ON COLUMN flow_his_task.del_flag IS '删除标志';
COMMENT ON COLUMN flow_his_task.tenant_id IS '租户id';
@@ -278,7 +258,6 @@ CREATE TABLE flow_user
create_time timestamp NULL,
create_by varchar(80) NULL,
update_time timestamp NULL,
- update_by varchar(64) NULL DEFAULT '':: character varying,
del_flag bpchar(1) NULL DEFAULT '0':: character varying,
tenant_id varchar(40) NULL,
CONSTRAINT flow_user_pk PRIMARY KEY (id)
@@ -294,7 +273,6 @@ COMMENT ON COLUMN flow_user.associated IS '任务表id';
COMMENT ON COLUMN flow_user.create_time IS '创建时间';
COMMENT ON COLUMN flow_user.create_by IS '创建人';
COMMENT ON COLUMN flow_user.update_time IS '更新时间';
-COMMENT ON COLUMN flow_user.update_by IS '更新人';
COMMENT ON COLUMN flow_user.del_flag IS '删除标志';
COMMENT ON COLUMN flow_user.tenant_id IS '租户id';
diff --git a/script/sql/ry-workflow.sql b/script/sql/ry-workflow.sql
index eaaf31c25..c93359711 100644
--- a/script/sql/ry-workflow.sql
+++ b/script/sql/ry-workflow.sql
@@ -17,9 +17,7 @@ CREATE TABLE `flow_definition`
`listener_path` varchar(400) DEFAULT NULL COMMENT '监听器路径',
`ext` varchar(500) DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新人',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE
@@ -44,9 +42,7 @@ CREATE TABLE `flow_node`
`form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径',
`version` varchar(20) NOT NULL COMMENT '版本',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新人',
`ext` text COMMENT '节点扩展属性',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
@@ -66,9 +62,7 @@ CREATE TABLE `flow_skip`
`skip_condition` varchar(200) DEFAULT NULL COMMENT '跳转条件',
`coordinate` varchar(100) DEFAULT NULL COMMENT '坐标',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新人',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE
@@ -86,10 +80,9 @@ CREATE TABLE `flow_instance`
`flow_status` varchar(20) NOT NULL COMMENT '流程状态（0待提交 1审批中 2审批通过 4终止 5作废 6撤销 8已完成 9已退回 10失效 11拿回）',
`activity_status` tinyint(1) NOT NULL DEFAULT '1' COMMENT '流程激活状态（0挂起 1激活）',
`def_json` text COMMENT '流程定义json',
+ `create_by` varchar(64) DEFAULT '' COMMENT '创建者',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新人',
`ext` varchar(500) DEFAULT NULL COMMENT '扩展字段，预留给业务系统使用',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
@@ -108,9 +101,7 @@ CREATE TABLE `flow_task`
`form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义（Y是 N否）',
`form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径',
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
- `create_by` varchar(64) DEFAULT '' COMMENT '创建人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新人',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE
@@ -127,7 +118,7 @@ CREATE TABLE `flow_his_task`
`node_type` tinyint(1) DEFAULT NULL COMMENT '开始节点类型（0开始节点 1中间节点 2结束节点 3互斥网关 4并行网关）',
`target_node_code` varchar(200) DEFAULT NULL COMMENT '目标节点编码',
`target_node_name` varchar(200) DEFAULT NULL COMMENT '结束节点名称',
- `approver` varchar(40) DEFAULT NULL COMMENT '审批人',
+ `approver` varchar(40) DEFAULT NULL COMMENT '审批者',
`cooperate_type` tinyint(1) NOT NULL DEFAULT '0' COMMENT '协作方式(1审批 2转办 3委派 4会签 5票签 6加签 7减签)',
`collaborator` varchar(500) DEFAULT NULL COMMENT '协作人',
`skip_type` varchar(10) NOT NULL COMMENT '流转类型（PASS通过 REJECT退回 NONE无动作）',
@@ -139,7 +130,6 @@ CREATE TABLE `flow_his_task`
`ext` TEXT DEFAULT NULL COMMENT '业务详情 存业务表对象json字符串',
`create_time` datetime DEFAULT NULL COMMENT '任务开始时间',
`update_time` datetime DEFAULT NULL COMMENT '审批完成时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '更新人',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE
@@ -155,7 +145,6 @@ CREATE TABLE `flow_user`
`create_time` datetime DEFAULT NULL COMMENT '创建时间',
`create_by` varchar(80) DEFAULT NULL COMMENT '创建人',
`update_time` datetime DEFAULT NULL COMMENT '更新时间',
- `update_by` varchar(64) DEFAULT '' COMMENT '创建人',
`del_flag` char(1) DEFAULT '0' COMMENT '删除标志',
`tenant_id` varchar(40) DEFAULT NULL COMMENT '租户id',
PRIMARY KEY (`id`) USING BTREE,
diff --git a/script/sql/update/oracle/update_2.4.1-2.5.0.sql b/script/sql/update/oracle/update_2.4.1-2.5.0.sql
index e07a47b0f..231267cdd 100644
--- a/script/sql/update/oracle/update_2.4.1-2.5.0.sql
+++ b/script/sql/update/oracle/update_2.4.1-2.5.0.sql
@@ -94,32 +94,3 @@ update sys_menu set remark = '/system/user' where menu_id = 131;
update sys_menu set remark = '/system/dict' where menu_id = 132;
update sys_menu set remark = '/system/oss' where menu_id = 133;
update sys_menu set remark = '/workflow/processDefinition' where menu_id = 11700;
-
-ALTER TABLE flow_definition ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_definition ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_definition.create_by IS '创建人';
-COMMENT ON COLUMN flow_definition.update_by IS '更新人';
-
-ALTER TABLE flow_node ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_node ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_node.create_by IS '创建人';
-COMMENT ON COLUMN flow_node.update_by IS '更新人';
-
-ALTER TABLE flow_skip ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_skip ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_skip.create_by IS '创建人';
-COMMENT ON COLUMN flow_skip.update_by IS '更新人';
-
-ALTER TABLE flow_instance ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_instance.update_by IS '更新人';
-
-ALTER TABLE flow_task ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_task ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_task.create_by IS '创建人';
-COMMENT ON COLUMN flow_task.update_by IS '更新人';
-
-ALTER TABLE flow_his_task ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_his_task.update_by IS '更新人';
-
-ALTER TABLE flow_user ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_user.update_by IS '更新人';
diff --git a/script/sql/update/postgres/update_2.4.1-2.5.0.sql b/script/sql/update/postgres/update_2.4.1-2.5.0.sql
index 8c02f23c8..48975b43f 100644
--- a/script/sql/update/postgres/update_2.4.1-2.5.0.sql
+++ b/script/sql/update/postgres/update_2.4.1-2.5.0.sql
@@ -95,32 +95,3 @@ update sys_menu set remark = '/system/user' where menu_id = 131;
update sys_menu set remark = '/system/dict' where menu_id = 132;
update sys_menu set remark = '/system/oss' where menu_id = 133;
update sys_menu set remark = '/workflow/processDefinition' where menu_id = 11700;
-
-ALTER TABLE flow_definition ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_definition ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_definition.create_by IS '创建人';
-COMMENT ON COLUMN flow_definition.update_by IS '更新人';
-
-ALTER TABLE flow_node ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_node ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_node.create_by IS '创建人';
-COMMENT ON COLUMN flow_node.update_by IS '更新人';
-
-ALTER TABLE flow_skip ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_skip ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_skip.create_by IS '创建人';
-COMMENT ON COLUMN flow_skip.update_by IS '更新人';
-
-ALTER TABLE flow_instance ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_instance.update_by IS '更新人';
-
-ALTER TABLE flow_task ADD create_by VARCHAR2(64) DEFAULT '' NOT NULL;
-ALTER TABLE flow_task ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_task.create_by IS '创建人';
-COMMENT ON COLUMN flow_task.update_by IS '更新人';
-
-ALTER TABLE flow_his_task ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_his_task.update_by IS '更新人';
-
-ALTER TABLE flow_user ADD update_by VARCHAR2(64) DEFAULT '' NOT NULL;
-COMMENT ON COLUMN flow_user.update_by IS '更新人';
diff --git a/script/sql/update/update_2.4.1-2.5.0.sql b/script/sql/update/update_2.4.1-2.5.0.sql
index 17476f1b5..8faead3b0 100644
--- a/script/sql/update/update_2.4.1-2.5.0.sql
+++ b/script/sql/update/update_2.4.1-2.5.0.sql
@@ -64,28 +64,3 @@ update sys_menu set remark = '/system/user' where menu_id = 131;
update sys_menu set remark = '/system/dict' where menu_id = 132;
update sys_menu set remark = '/system/oss' where menu_id = 133;
update sys_menu set remark = '/workflow/processDefinition' where menu_id = 11700;
-
-ALTER TABLE `flow_definition`
- ADD COLUMN `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `create_time`,
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;
-
-ALTER TABLE `flow_node`
- ADD COLUMN `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `create_time`,
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;
-
-ALTER TABLE `flow_skip`
- ADD COLUMN `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `create_time`,
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;
-
-ALTER TABLE `flow_instance`
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;
-
-ALTER TABLE `flow_task`
- ADD COLUMN `create_by` varchar(64) NULL DEFAULT NULL COMMENT '创建人' AFTER `create_time`,
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;
-
-ALTER TABLE `flow_his_task`
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;
-
-ALTER TABLE `flow_user`
- ADD COLUMN `update_by` varchar(64) NULL DEFAULT NULL COMMENT '更新人' AFTER `update_time`;