From eaed181aa993e2aa5f8be6bda9c23c2c2f560984 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 23 Jan 2024 10:58:34 +0800 Subject: [PATCH] =?UTF-8?q?:card=5Ffile=5Fbox:=20=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E7=9B=B8=E5=85=B3=E7=9A=84=E5=8F=98?= =?UTF-8?q?=E5=8C=96=20=E7=BB=9F=E4=B8=80flow=20=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E3=80=90del=5Ffla?= =?UTF-8?q?g=E3=80=91/=20=E3=80=90bool=E3=80=91=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/3pigxx_flow.sql | 16 ++++++++-------- .../pig4cloud/pigx/flow/task/entity/Process.java | 4 ++-- .../pig4cloud/pigx/flow/task/vo/FormGroupVo.java | 2 +- .../impl/CombinationGroupServiceImpl.java | 2 +- .../task/service/impl/ProcessServiceImpl.java | 8 ++++---- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/db/3pigxx_flow.sql b/db/3pigxx_flow.sql index 196c72acf..fb65b00d8 100644 --- a/db/3pigxx_flow.sql +++ b/db/3pigxx_flow.sql @@ -9,7 +9,7 @@ SET FOREIGN_KEY_CHECKS = 0; DROP TABLE IF EXISTS `process`; CREATE TABLE `process` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间', `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL DEFAULT '' COMMENT '表单ID', @@ -40,7 +40,7 @@ CREATE TABLE `process` ( DROP TABLE IF EXISTS `process_copy`; CREATE TABLE `process_copy` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', `start_time` datetime NOT NULL COMMENT ' 流程发起时间', @@ -67,7 +67,7 @@ CREATE TABLE `process_copy` ( DROP TABLE IF EXISTS `process_group`; CREATE TABLE `process_group` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL COMMENT '更新时间', `group_name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '分组名', @@ -88,7 +88,7 @@ CREATE TABLE `process_instance_record` ( `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程名字', `logo` varchar(200) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '头像', `user_id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime DEFAULT NULL COMMENT '创建时间', `update_time` datetime DEFAULT NULL ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间', `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '流程id', @@ -112,7 +112,7 @@ CREATE TABLE `process_instance_record` ( DROP TABLE IF EXISTS `process_node_data`; CREATE TABLE `process_node_data` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程id', @@ -130,7 +130,7 @@ CREATE TABLE `process_node_data` ( DROP TABLE IF EXISTS `process_node_record`; CREATE TABLE `process_node_record` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程id', @@ -155,7 +155,7 @@ CREATE TABLE `process_node_record` ( DROP TABLE IF EXISTS `process_node_record_assign_user`; CREATE TABLE `process_node_record_assign_user` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', `flow_id` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '流程id', @@ -184,7 +184,7 @@ CREATE TABLE `process_node_record_assign_user` ( DROP TABLE IF EXISTS `process_starter`; CREATE TABLE `process_starter` ( `id` bigint NOT NULL COMMENT '用户id', - `del_flag` tinyint(1) NOT NULL COMMENT '逻辑删除字段', + `del_flag` char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT '0' COMMENT '删除标志', `create_time` datetime NOT NULL COMMENT '创建时间', `update_time` datetime NOT NULL COMMENT '更新时间', `type_id` bigint NOT NULL COMMENT '用户id或者部门id', diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java index 28f086e6c..9473e03b5 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/entity/Process.java @@ -78,13 +78,13 @@ public class Process { * 0 正常 1=隐藏 */ @TableField("is_hidden") - private Boolean hidden; + private String hidden; /** * 0 正常 1=停用 */ @TableField("is_stop") - private Boolean stop; + private String stop; /** * 流程管理员 diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java index dc3779fd4..0114c0cb6 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-api/src/main/java/com/pig4cloud/pigx/flow/task/vo/FormGroupVo.java @@ -46,7 +46,7 @@ public class FormGroupVo { private String logo; - private Boolean stop; + private String stop; private String remark; diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java index 3e5afcd6b..54f8cd6d2 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/CombinationGroupServiceImpl.java @@ -34,7 +34,7 @@ public class CombinationGroupServiceImpl implements ICombinationGroupService { /** * 查询表单组包含流程 - * @param hidden + * @param groupId groupId * @return 表单组数据 */ @Override diff --git a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java index 8d3c7aa9b..e1949e305 100644 --- a/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java +++ b/pigx-flow/pigx-flow-task/pigx-flow-task-biz/src/main/java/com/pig4cloud/pigx/flow/task/service/impl/ProcessServiceImpl.java @@ -211,8 +211,8 @@ public class ProcessServiceImpl extends ServiceImpl impl p.setProcess(process.getProcess()); p.setRemark(process.getRemark()); p.setSort(0); - p.setHidden(false); - p.setStop(false); + p.setHidden("0"); + p.setStop("0"); p.setAdminId(nodeUser.getId()); p.setUniqueId(IdUtil.fastSimpleUUID()); p.setAdminList(process.getAdminList()); @@ -244,8 +244,8 @@ public class ProcessServiceImpl extends ServiceImpl impl public R update(String flowId, String type, Long groupId) { Process process = new Process(); process.setFlowId(flowId); - process.setStop("stop".equals(type)); - process.setHidden("delete".equals(type)); + process.setStop("stop".equals(type) ? "1" : "0"); + process.setHidden("delete".equals(type) ? "1" : "0"); process.setGroupId(groupId); this.updateByFlowId(process); return R.ok();