diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql index 571574739..3130f325c 100644 --- a/script/sql/oracle/oracle_ry_workflow.sql +++ b/script/sql/oracle/oracle_ry_workflow.sql @@ -179,7 +179,6 @@ 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 '更新时间'; @@ -250,7 +249,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 +276,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 '协作人'; @@ -292,7 +289,7 @@ create table FLOW_USER PROCESSED_BY VARCHAR2(80), ASSOCIATED NUMBER(20) not null, CREATE_TIME DATE, - CREATE_BY VARCHAR2(80), + CREATE_BY VARCHAR2(64) default '', UPDATE_TIME DATE, UPDATE_BY VARCHAR2(64) default '', DEL_FLAG VARCHAR2(1) default '0', @@ -308,7 +305,7 @@ comment on column FLOW_USER.TYPE is '人员类型（1待办任务的审批人权 comment on column FLOW_USER.PROCESSED_BY is '权限人)'; 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.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 '删除标志'; diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql index 15060d03d..370f526eb 100644 --- a/script/sql/postgres/postgres_ry_workflow.sql +++ b/script/sql/postgres/postgres_ry_workflow.sql @@ -237,7 +237,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 +252,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 +264,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'; @@ -276,7 +274,7 @@ CREATE TABLE flow_user processed_by varchar(80) NULL, associated int8 NOT NULL, create_time timestamp NULL, - create_by varchar(80) 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, diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index ea8f30aa4..f79a1667f 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -139,7 +139,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 diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql index 4340021b8..f187e3879 100644 --- a/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql @@ -16,9 +16,9 @@ CREATE TABLE flow_definition ( listener_path nvarchar(400) NULL, ext nvarchar(500) NULL, create_time datetime2(7) NULL, - create_by nvarchar(64) DEFAULT('') NULL, + create_by nvarchar(64) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, + update_by nvarchar(64) NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, CONSTRAINT PK__flow_def__3213E83FEE39AE33 PRIMARY KEY CLUSTERED (id) @@ -126,13 +126,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_time' GO -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'flow_definition', -'COLUMN', N'update_time' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', N'dbo', @@ -140,6 +133,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_by' GO +EXEC sp_addextendedproperty +'MS_Description', N'更新时间', +'SCHEMA', N'dbo', +'TABLE', N'flow_definition', +'COLUMN', N'update_time' +GO + EXEC sp_addextendedproperty 'MS_Description', N'更新人', 'SCHEMA', N'dbo', @@ -185,9 +185,9 @@ CREATE TABLE flow_node ( form_path nvarchar(100) NULL, version nvarchar(20) NOT NULL, create_time datetime2(7) NULL, - create_by nvarchar(64) DEFAULT('') NULL, + create_by nvarchar(64) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, + update_by nvarchar(64) NULL, ext nvarchar(max) NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, @@ -317,13 +317,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_time' GO -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'flow_node', -'COLUMN', N'update_time' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', N'dbo', @@ -331,6 +324,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_by' GO +EXEC sp_addextendedproperty +'MS_Description', N'更新时间', +'SCHEMA', N'dbo', +'TABLE', N'flow_node', +'COLUMN', N'update_time' +GO + EXEC sp_addextendedproperty 'MS_Description', N'更新人', 'SCHEMA', N'dbo', @@ -378,9 +378,9 @@ CREATE TABLE flow_skip ( skip_condition nvarchar(200) NULL, coordinate nvarchar(100) NULL, create_time datetime2(7) NULL, - create_by nvarchar(64) DEFAULT('') NULL, + create_by nvarchar(64) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, + update_by nvarchar(64) NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, CONSTRAINT PK__flow_ski__3213E83F073FEE6E PRIMARY KEY CLUSTERED (id) @@ -467,13 +467,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_time' GO -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'flow_skip', -'COLUMN', N'update_time' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', N'dbo', @@ -481,6 +474,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_by' GO +EXEC sp_addextendedproperty +'MS_Description', N'更新时间', +'SCHEMA', N'dbo', +'TABLE', N'flow_skip', +'COLUMN', N'update_time' +GO + EXEC sp_addextendedproperty 'MS_Description', N'更新人', 'SCHEMA', N'dbo', @@ -520,9 +520,9 @@ CREATE TABLE flow_instance ( activity_status tinyint DEFAULT('1') NULL, def_json nvarchar(max) NULL, create_time datetime2(7) NULL, - create_by nvarchar(64) DEFAULT('') NULL, + create_by nvarchar(64) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, + update_by nvarchar(64) NULL, ext nvarchar(500) NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, @@ -604,13 +604,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'def_json' GO -EXEC sp_addextendedproperty -'MS_Description', N'创建者', -'SCHEMA', N'dbo', -'TABLE', N'flow_instance', -'COLUMN', N'create_by' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建时间', 'SCHEMA', N'dbo', @@ -618,13 +611,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_time' GO -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'flow_instance', -'COLUMN', N'update_time' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', N'dbo', @@ -632,6 +618,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_by' GO +EXEC sp_addextendedproperty +'MS_Description', N'更新时间', +'SCHEMA', N'dbo', +'TABLE', N'flow_instance', +'COLUMN', N'update_time' +GO + EXEC sp_addextendedproperty 'MS_Description', N'更新人', 'SCHEMA', N'dbo', @@ -677,9 +670,9 @@ CREATE TABLE flow_task ( form_custom nchar(1) DEFAULT('N') NULL, form_path nvarchar(100) NULL, create_time datetime2(7) NULL, - create_by nvarchar(64) DEFAULT('') NULL, + create_by nvarchar(64) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, + update_by nvarchar(64) NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, CONSTRAINT PK__flow_tas__3213E83F5AE1F1BA PRIMARY KEY CLUSTERED (id) @@ -759,13 +752,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_time' GO -EXEC sp_addextendedproperty -'MS_Description', N'更新时间', -'SCHEMA', N'dbo', -'TABLE', N'flow_task', -'COLUMN', N'update_time' -GO - EXEC sp_addextendedproperty 'MS_Description', N'创建人', 'SCHEMA', N'dbo', @@ -773,6 +759,13 @@ EXEC sp_addextendedproperty 'COLUMN', N'create_by' GO +EXEC sp_addextendedproperty +'MS_Description', N'更新时间', +'SCHEMA', N'dbo', +'TABLE', N'flow_task', +'COLUMN', N'update_time' +GO + EXEC sp_addextendedproperty 'MS_Description', N'更新人', 'SCHEMA', N'dbo', @@ -822,7 +815,6 @@ CREATE TABLE flow_his_task ( ext nvarchar(max) NULL, create_time datetime2(7) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, CONSTRAINT PK__flow_his__3213E83F67951564 PRIMARY KEY CLUSTERED (id) @@ -979,13 +971,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'update_time' GO -EXEC sp_addextendedproperty -'MS_Description', N'更新人', -'SCHEMA', N'dbo', -'TABLE', N'flow_his_task', -'COLUMN', N'update_by' -GO - EXEC sp_addextendedproperty 'MS_Description', N'删除标志', 'SCHEMA', N'dbo', @@ -1012,9 +997,9 @@ CREATE TABLE flow_user ( processed_by nvarchar(80) NULL, associated bigint NOT NULL, create_time datetime2(7) NULL, - create_by nvarchar(80) NULL, + create_by nvarchar(64) NULL, update_time datetime2(7) NULL, - update_by nvarchar(64) DEFAULT('') NULL, + update_by nvarchar(64) NULL, del_flag nchar(1) DEFAULT('0') NULL, tenant_id nvarchar(40) NULL, CONSTRAINT PK__flow_use__3213E83FFA38CA8B PRIMARY KEY CLUSTERED (id) diff --git a/script/sql/update/oracle/update_5.5.0-5.5.1.sql b/script/sql/update/oracle/update_5.5.0-5.5.1.sql index 54c733766..8fa28c007 100644 --- a/script/sql/update/oracle/update_5.5.0-5.5.1.sql +++ b/script/sql/update/oracle/update_5.5.0-5.5.1.sql @@ -21,8 +21,5 @@ 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_5.5.0-5.5.1.sql b/script/sql/update/postgres/update_5.5.0-5.5.1.sql index 54c733766..8fa28c007 100644 --- a/script/sql/update/postgres/update_5.5.0-5.5.1.sql +++ b/script/sql/update/postgres/update_5.5.0-5.5.1.sql @@ -21,8 +21,5 @@ 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/sqlserver/update_5.5.0-5.5.1.sql b/script/sql/update/sqlserver/update_5.5.0-5.5.1.sql index 167185611..8388f336b 100644 --- a/script/sql/update/sqlserver/update_5.5.0-5.5.1.sql +++ b/script/sql/update/sqlserver/update_5.5.0-5.5.1.sql @@ -88,16 +88,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'update_by' GO -ALTER TABLE flow_his_task ADD update_by nvarchar(64) NOT NULL CONSTRAINT DF_flow_his_task_update_by DEFAULT ''; -GO - -EXEC sp_addextendedproperty -'MS_Description', N'更新人', -'SCHEMA', N'dbo', -'TABLE', N'flow_his_task', -'COLUMN', N'update_by' -GO - ALTER TABLE flow_user ADD update_by nvarchar(64) NOT NULL CONSTRAINT DF_flow_user_update_by DEFAULT ''; GO diff --git a/script/sql/update/update_5.5.0-5.5.1.sql b/script/sql/update/update_5.5.0-5.5.1.sql index 61da278f9..17a60af35 100644 --- a/script/sql/update/update_5.5.0-5.5.1.sql +++ b/script/sql/update/update_5.5.0-5.5.1.sql @@ -17,8 +17,5 @@ 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`;