From 3c2c87364b89de46d12e95abd5bdf8cbd2c6dbf6 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 08:43:23 +0800
Subject: [PATCH] dev-init
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 126 ++++++++---------------------------------
1 files changed, 26 insertions(+), 100 deletions(-)
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 c59b7ad..a62ce5f 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
@@ -111,116 +111,42 @@
public Boolean deleteWithValidByIds(Collection<Long> ids) {
List<String> idList = StreamUtils.toList(ids, String::valueOf);
workflowService.deleteRunAndHisInstance(idList);
- return baseMapper.deleteBatchIds(ids) > 0;
+ return baseMapper.deleteByIds(ids) > 0;
+ }
+
+ /**
+ * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
+ * 姝ｅ父浣跨敤鍙渶#processEvent.key=='leave1'
+ * 绀轰緥涓轰簡鏂逛究鍒欎娇鐢╯tartsWith鍖归厤浜嗗叏閮ㄧず渚媖ey
+ *
+ * @param processEvent 鍙傛暟
+ */
+ @EventListener(condition = "#processEvent.key.startsWith('leave')")
+ public void processHandler(ProcessEvent processEvent) {
+ log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
+ TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
+ testLeave.setStatus(processEvent.getStatus());
+ if (processEvent.isSubmit()) {
+ testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
+ }
+ baseMapper.updateById(testLeave);
}
/**
* 鎵ц鍔炵悊浠诲姟鐩戝惉
+ * 绀轰緥锛氫篃鍙�氳繃 @EventListener(condition = "#processTaskEvent.key=='leave1'")杩涜鍒ゆ柇
+ * 鍦ㄦ柟娉曚腑鍒ゆ柇娴佺▼鑺傜偣key
+ * if ("xxx".equals(processTaskEvent.getTaskDefinitionKey())) {
+ * //鎵ц涓氬姟閫昏緫
+ * }
*
* @param processTaskEvent 鍙傛暟
*/
- @EventListener(condition = "#processTaskEvent.keyNode=='leave1_Activity_14633hx'")
- public void leave1Task(ProcessTaskEvent processTaskEvent) {
+ @EventListener(condition = "#processTaskEvent.key=='leave1' && #processTaskEvent.taskDefinitionKey=='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);
- }
-
-
- /**
- * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
- *
- * @param processEvent 鍙傛暟
- */
- @EventListener(condition = "#processEvent.key=='leave1'")
- public void leave1(ProcessEvent processEvent) {
- log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
- TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
- testLeave.setStatus(processEvent.getStatus());
- if (processEvent.isSubmit()) {
- testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
- }
- baseMapper.updateById(testLeave);
- }
-
- /**
- * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
- *
- * @param processEvent 鍙傛暟
- */
- @EventListener(condition = "#processEvent.key=='leave2'")
- public void leave2(ProcessEvent processEvent) {
- log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
- TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
- testLeave.setStatus(processEvent.getStatus());
- if (processEvent.isSubmit()) {
- testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
- }
- baseMapper.updateById(testLeave);
- }
-
- /**
- * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
- *
- * @param processEvent 鍙傛暟
- */
- @EventListener(condition = "#processEvent.key=='leave3'")
- public void leave3(ProcessEvent processEvent) {
- log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
- TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
- testLeave.setStatus(processEvent.getStatus());
- if (processEvent.isSubmit()) {
- testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
- }
- baseMapper.updateById(testLeave);
- }
-
- /**
- * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
- *
- * @param processEvent 鍙傛暟
- */
- @EventListener(condition = "#processEvent.key=='leave4'")
- public void leave4(ProcessEvent processEvent) {
- log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
- TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
- testLeave.setStatus(processEvent.getStatus());
- if (processEvent.isSubmit()) {
- testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
- }
- baseMapper.updateById(testLeave);
- }
-
- /**
- * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
- *
- * @param processEvent 鍙傛暟
- */
- @EventListener(condition = "#processEvent.key=='leave5'")
- public void leave5(ProcessEvent processEvent) {
- log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
- TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
- testLeave.setStatus(processEvent.getStatus());
- if (processEvent.isSubmit()) {
- testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
- }
- baseMapper.updateById(testLeave);
- }
-
- /**
- * 鎬讳綋娴佺▼鐩戝惉(渚嬪: 鎻愪氦 閫�鍥� 鎾ら攢 缁堟 浣滃簾绛�)
- *
- * @param processEvent 鍙傛暟
- */
- @EventListener(condition = "#processEvent.key=='leave6'")
- public void leave6(ProcessEvent processEvent) {
- log.info("褰撳墠浠诲姟鎵ц浜唟}", processEvent.toString());
- TestLeave testLeave = baseMapper.selectById(Long.valueOf(processEvent.getBusinessKey()));
- testLeave.setStatus(processEvent.getStatus());
- if (processEvent.isSubmit()) {
- testLeave.setStatus(BusinessStatusEnum.WAITING.getStatus());
- }
baseMapper.updateById(testLeave);
}
}
--
Gitblit v1.9.3