From 512b5204bc717b78bfbb76afaf81076de9a9f302 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期日, 02 六月 2024 18:24:52 +0800
Subject: [PATCH] add 添加业务表状态更新示例
---
script/sql/sqlserver/flowable.sql | 4 ++++
script/sql/oracle/flowable.sql | 2 ++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java | 6 ++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java | 2 +-
ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 7 +++++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java | 5 +++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java | 5 +++++
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java | 2 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 4 +---
script/sql/flowable.sql | 1 +
script/sql/postgres/flowable.sql | 3 +++
12 files changed, 37 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
similarity index 98%
rename from ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java
rename to ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
index 6eb6ffe..0af943a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/enums/BusinessStatusEnum.java
+++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/enums/BusinessStatusEnum.java
@@ -1,4 +1,4 @@
-package org.dromara.workflow.common.enums;
+package org.dromara.common.core.enums;
import cn.hutool.core.util.StrUtil;
import lombok.AllArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java
index 0e26467..7d42a9b 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/TestLeave.java
@@ -54,5 +54,10 @@
*/
private String remark;
+ /**
+ * 鐘舵��
+ */
+ private String status;
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
index e71be59..877e981 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TestLeaveBo.java
@@ -71,5 +71,10 @@
*/
private String remark;
+ /**
+ * 鐘舵��
+ */
+ private String status;
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
index 7904d52..29709e7 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TestLeaveVo.java
@@ -63,6 +63,12 @@
private String remark;
/**
+ * 鐘舵��
+ */
+ @ExcelProperty(value = "璇峰亣鍘熷洜")
+ private String status;
+
+ /**
* 涓氬姟涓庢祦绋嬪疄渚嬪叧鑱斿璞�
*/
private BusinessInstanceDTO businessInstanceDTO;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index 9937f7a..9533cac 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -16,7 +16,7 @@
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.workflow.common.constant.FlowConstant;
-import org.dromara.workflow.common.enums.BusinessStatusEnum;
+import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiProcinst;
import org.dromara.workflow.domain.bo.ProcessInstanceBo;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 5e9a050..9dd0d60 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -9,10 +9,8 @@
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.dto.RoleDTO;
import org.dromara.common.core.domain.dto.UserDTO;
-import org.dromara.common.core.domain.event.ProcessTaskEvent;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.service.UserService;
-import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.mybatis.core.page.PageQuery;
@@ -20,7 +18,7 @@
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.workflow.common.constant.FlowConstant;
-import org.dromara.workflow.common.enums.BusinessStatusEnum;
+import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiTaskinst;
import org.dromara.workflow.domain.WfTaskBackNode;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
index d451b45..aed3e89 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -8,6 +8,7 @@
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.core.domain.event.ProcessEvent;
import org.dromara.common.core.domain.event.ProcessTaskEvent;
+import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.common.core.service.WorkflowService;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.core.utils.StreamUtils;
@@ -131,6 +132,9 @@
@EventListener(condition = "#processEvent.key=='leave1'")
public void processHandler(ProcessEvent processEvent) {
log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
+ TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
+ testLeave.setStatus(processEvent.getStatus());
+ baseMapper.updateById(testLeave);
}
/**
@@ -141,6 +145,9 @@
@EventListener(condition = "#processTaskEvent.keyNode=='leave1_Activity_14633hx'")
public void processTaskHandler(ProcessTaskEvent processTaskEvent) {
log.info("褰撳墠浠诲姟鎵ц浜唟}", processTaskEvent.toString());
+ TestLeave testLeave = baseMapper.selectById(Long.valueOf(processTaskEvent.getBusinessKey()));
+ testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
+ baseMapper.updateById(testLeave);
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
index aa84387..f342e78 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/WorkflowUtils.java
@@ -21,7 +21,7 @@
import org.dromara.common.websocket.dto.WebSocketMessageDto;
import org.dromara.common.websocket.utils.WebSocketUtils;
import org.dromara.workflow.common.constant.FlowConstant;
-import org.dromara.workflow.common.enums.BusinessStatusEnum;
+import org.dromara.common.core.enums.BusinessStatusEnum;
import org.dromara.workflow.common.enums.MessageTypeEnum;
import org.dromara.workflow.common.enums.TaskStatusEnum;
import org.dromara.workflow.domain.ActHiProcinst;
diff --git a/script/sql/flowable.sql b/script/sql/flowable.sql
index 6b3a7e7..e8dc798 100644
--- a/script/sql/flowable.sql
+++ b/script/sql/flowable.sql
@@ -27,6 +27,7 @@
end_date datetime not null comment '缁撴潫鏃堕棿',
leave_days int(10) not null comment '璇峰亣澶╂暟',
remark varchar(255) null comment '璇峰亣鍘熷洜',
+ status varchar(255) null comment '鐘舵��',
create_dept bigint null comment '鍒涘缓閮ㄩ棬',
create_by bigint null comment '鍒涘缓鑰�',
create_time datetime null comment '鍒涘缓鏃堕棿',
diff --git a/script/sql/oracle/flowable.sql b/script/sql/oracle/flowable.sql
index 7ab6a04..65474f4 100644
--- a/script/sql/oracle/flowable.sql
+++ b/script/sql/oracle/flowable.sql
@@ -30,6 +30,7 @@
END_DATE DATE,
LEAVE_DAYS NUMBER(10),
REMARK VARCHAR2(255),
+ STATUS VARCHAR2(255),
CREATE_DEPT NUMBER(20),
CREATE_BY NUMBER(20),
CREATE_TIME DATE,
@@ -45,6 +46,7 @@
comment on column TEST_LEAVE.END_DATE is '缁撴潫鏃堕棿';
comment on column TEST_LEAVE.LEAVE_DAYS is '璇峰亣澶╂暟';
comment on column TEST_LEAVE.REMARK is '璇峰亣鍘熷洜';
+comment on column TEST_LEAVE.STATUS is '鐘舵��';
comment on column TEST_LEAVE.CREATE_DEPT is '鍒涘缓閮ㄩ棬';
comment on column TEST_LEAVE.CREATE_BY is '鍒涘缓鑰�';
comment on column TEST_LEAVE.CREATE_TIME is '鍒涘缓鏃堕棿';
diff --git a/script/sql/postgres/flowable.sql b/script/sql/postgres/flowable.sql
index bb69016..6e75e4b 100644
--- a/script/sql/postgres/flowable.sql
+++ b/script/sql/postgres/flowable.sql
@@ -29,6 +29,7 @@
end_date timestamp,
leave_days bigint,
remark varchar(255),
+ status varchar(255),
create_dept bigint,
create_by bigint,
create_time timestamp,
@@ -49,6 +50,8 @@
comment on column test_leave.remark is '璇峰亣鍘熷洜';
+comment on column test_leave.status is '鐘舵��';
+
comment on column test_leave.create_dept is '鍒涘缓閮ㄩ棬';
comment on column test_leave.create_by is '鍒涘缓鑰�';
diff --git a/script/sql/sqlserver/flowable.sql b/script/sql/sqlserver/flowable.sql
index c8fe88b..2397c35 100644
--- a/script/sql/sqlserver/flowable.sql
+++ b/script/sql/sqlserver/flowable.sql
@@ -28,6 +28,7 @@
end_date datetime2 not null,
leave_days int not null,
remark nvarchar(255),
+ status nvarchar(255),
create_dept bigint,
create_by bigint,
create_time datetime2,
@@ -61,6 +62,9 @@
exec sp_addextendedproperty 'MS_Description', N'璇峰亣鍘熷洜', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'remark'
go
+exec sp_addextendedproperty 'MS_Description', N'鐘舵��', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN', 'status'
+go
+
exec sp_addextendedproperty 'MS_Description', N'鍒涘缓閮ㄩ棬', 'SCHEMA', 'dbo', 'TABLE', 'test_leave', 'COLUMN',
'create_dept'
go
--
Gitblit v1.9.3