diff --git a/pom.xml b/pom.xml index 3ba5b2087..8b603c29e 100644 --- a/pom.xml +++ b/pom.xml @@ -48,7 +48,7 @@ 8.7.2-20250603 - 1.8.3 + 1.8.4 3.4.2 diff --git a/script/sql/oracle/oracle_ry_workflow.sql b/script/sql/oracle/oracle_ry_workflow.sql index e7a82f489..5c1b4a238 100644 --- a/script/sql/oracle/oracle_ry_workflow.sql +++ b/script/sql/oracle/oracle_ry_workflow.sql @@ -55,13 +55,12 @@ create table FLOW_NODE DEFINITION_ID NUMBER(20) not null, NODE_CODE VARCHAR2(100) not null, NODE_NAME VARCHAR2(100), - NODE_RATIO NUMBER(6, 3), + PERMISSION_FLAG VARCHAR2(200), + NODE_RATIO VARCHAR2(200), COORDINATE VARCHAR2(100), ANY_NODE_SKIP VARCHAR2(100), LISTENER_TYPE VARCHAR2(100), LISTENER_PATH VARCHAR2(500), - HANDLER_TYPE VARCHAR2(100), - HANDLER_PATH VARCHAR2(400), FORM_CUSTOM VARCHAR2(1) default 'N', FORM_PATH VARCHAR2(100), VERSION VARCHAR2(20), @@ -71,8 +70,7 @@ create table FLOW_NODE UPDATE_BY VARCHAR2(64) default '', EXT CLOB, DEL_FLAG VARCHAR2(1) default '0', - TENANT_ID VARCHAR2(40), - PERMISSION_FLAG VARCHAR2(200) + TENANT_ID VARCHAR2(40) ); alter table FLOW_NODE diff --git a/script/sql/postgres/postgres_ry_workflow.sql b/script/sql/postgres/postgres_ry_workflow.sql index 4e0db460a..88b8b303b 100644 --- a/script/sql/postgres/postgres_ry_workflow.sql +++ b/script/sql/postgres/postgres_ry_workflow.sql @@ -51,13 +51,11 @@ CREATE TABLE flow_node node_code varchar(100) NOT NULL, node_name varchar(100) NULL, permission_flag varchar(200) NULL, - node_ratio numeric(6, 3) NULL, + node_ratio varchar(200) NULL, coordinate varchar(100) NULL, any_node_skip varchar(100) NULL, listener_type varchar(100) NULL, listener_path varchar(400) NULL, - handler_type varchar(100) NULL, - handler_path varchar(400) NULL, form_custom bpchar(1) NULL DEFAULT 'N':: character varying, form_path varchar(100) NULL, "version" varchar(20) NOT NULL, diff --git a/script/sql/ry_workflow.sql b/script/sql/ry_workflow.sql index f79a1667f..c911a5bd1 100644 --- a/script/sql/ry_workflow.sql +++ b/script/sql/ry_workflow.sql @@ -33,13 +33,11 @@ CREATE TABLE `flow_node` `node_code` varchar(100) NOT NULL COMMENT '流程节点编码', `node_name` varchar(100) DEFAULT NULL COMMENT '流程节点名称', `permission_flag` varchar(200) DEFAULT NULL COMMENT '权限标识(权限类型:权限标识,可以多个,用@@隔开)', - `node_ratio` decimal(6, 3) DEFAULT NULL COMMENT '流程签署比例值', + `node_ratio` varchar(200) DEFAULT NULL COMMENT '流程签署比例值', `coordinate` varchar(100) DEFAULT NULL COMMENT '坐标', `any_node_skip` varchar(100) DEFAULT NULL COMMENT '任意结点跳转', `listener_type` varchar(100) DEFAULT NULL COMMENT '监听器类型', `listener_path` varchar(400) DEFAULT NULL COMMENT '监听器路径', - `handler_type` varchar(100) DEFAULT NULL COMMENT '处理器类型', - `handler_path` varchar(400) DEFAULT NULL COMMENT '处理器路径', `form_custom` char(1) DEFAULT 'N' COMMENT '审批表单是否自定义(Y是 N否)', `form_path` varchar(100) DEFAULT NULL COMMENT '审批表单路径', `version` varchar(20) NOT NULL COMMENT '版本', diff --git a/script/sql/sqlserver/sqlserver_ry_workflow.sql b/script/sql/sqlserver/sqlserver_ry_workflow.sql index df2e883f3..09a661fbd 100644 --- a/script/sql/sqlserver/sqlserver_ry_workflow.sql +++ b/script/sql/sqlserver/sqlserver_ry_workflow.sql @@ -174,13 +174,11 @@ CREATE TABLE flow_node ( node_code nvarchar(100) NOT NULL, node_name nvarchar(100) NULL, permission_flag nvarchar(200) NULL, - node_ratio decimal(6,3) NULL, + node_ratio nvarchar(200) NULL, coordinate nvarchar(100) NULL, any_node_skip nvarchar(100) NULL, listener_type nvarchar(100) NULL, listener_path nvarchar(400) NULL, - handler_type nvarchar(100) NULL, - handler_path nvarchar(400) NULL, form_custom nchar(1) DEFAULT('N') NULL, form_path nvarchar(100) NULL, version nvarchar(20) NOT NULL, @@ -275,20 +273,6 @@ EXEC sp_addextendedproperty 'COLUMN', N'listener_path' GO -EXEC sp_addextendedproperty -'MS_Description', N'处理器类型', -'SCHEMA', N'dbo', -'TABLE', N'flow_node', -'COLUMN', N'handler_type' -GO - -EXEC sp_addextendedproperty -'MS_Description', N'处理器路径', -'SCHEMA', N'dbo', -'TABLE', N'flow_node', -'COLUMN', N'handler_path' -GO - EXEC sp_addextendedproperty 'MS_Description', N'审批表单是否自定义(Y是 N否)', 'SCHEMA', N'dbo', diff --git a/script/sql/update/oracle/update_5.5.1-5.5.2.sql b/script/sql/update/oracle/update_5.5.1-5.5.2.sql new file mode 100644 index 000000000..17600d6b9 --- /dev/null +++ b/script/sql/update/oracle/update_5.5.1-5.5.2.sql @@ -0,0 +1,4 @@ +ALTER TABLE flow_node MODIFY (node_ratio VARCHAR2(200) DEFAULT NULL NULL); +COMMENT ON COLUMN flow_node.node_ratio IS '流程签署比例值'; +ALTER TABLE flow_node DROP COLUMN handler_type; +ALTER TABLE flow_node DROP COLUMN handler_path; diff --git a/script/sql/update/postgres/update_5.5.1-5.5.2.sql b/script/sql/update/postgres/update_5.5.1-5.5.2.sql new file mode 100644 index 000000000..bf2d69f84 --- /dev/null +++ b/script/sql/update/postgres/update_5.5.1-5.5.2.sql @@ -0,0 +1,6 @@ +ALTER TABLE flow_node + ALTER COLUMN node_ratio TYPE VARCHAR(200), + ALTER COLUMN node_ratio DROP NOT NULL; +COMMENT ON COLUMN flow_node.node_ratio IS '流程签署比例值'; +ALTER TABLE flow_node DROP COLUMN handler_type; +ALTER TABLE flow_node DROP COLUMN handler_path; diff --git a/script/sql/update/sqlserver/update_5.5.1-5.5.2.sql b/script/sql/update/sqlserver/update_5.5.1-5.5.2.sql new file mode 100644 index 000000000..716abb597 --- /dev/null +++ b/script/sql/update/sqlserver/update_5.5.1-5.5.2.sql @@ -0,0 +1,22 @@ +ALTER TABLE flow_node ALTER COLUMN node_ratio nvarchar(200) NULL; +GO +IF ((SELECT COUNT(*) FROM ::fn_listextendedproperty('MS_Description', +'SCHEMA', N'dbo', +'TABLE', N'flow_his_task', +'COLUMN', N'collaborator')) > 0) + EXEC sp_updateextendedproperty +'MS_Description', N'流程签署比例值', +'SCHEMA', N'dbo', +'TABLE', N'flow_node', +'COLUMN', N'node_ratio' +ELSE + EXEC sp_addextendedproperty +'MS_Description', N'流程签署比例值', +'SCHEMA', N'dbo', +'TABLE', N'flow_node', +'COLUMN', N'node_ratio' +GO +ALTER TABLE flow_node DROP COLUMN handler_type; +GO +ALTER TABLE flow_node DROP COLUMN handler_path; +GO diff --git a/script/sql/update/update_5.5.1-5.5.2.sql b/script/sql/update/update_5.5.1-5.5.2.sql new file mode 100644 index 000000000..d1e4cef20 --- /dev/null +++ b/script/sql/update/update_5.5.1-5.5.2.sql @@ -0,0 +1,3 @@ +ALTER TABLE flow_node MODIFY COLUMN node_ratio varchar(200) NULL COMMENT '流程签署比例值'; +ALTER TABLE flow_node DROP COLUMN handler_type; +ALTER TABLE flow_node DROP COLUMN handler_path;