From 5d18d02a9c87745d2cf7d8d3728947c5fa098d85 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Fri, 7 Jun 2024 22:19:09 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E7=A4=BA=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/TestLeaveServiceImpl.java    | 117 +++---------------
 1 file changed, 19 insertions(+), 98 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 c59b7ad41..e437a569e 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
@@ -114,113 +114,34 @@ public class TestLeaveServiceImpl implements ITestLeaveService {
         return baseMapper.deleteBatchIds(ids) > 0;
     }
 
+    /**
+     * 总体流程监听(例如: 提交 退回 撤销 终止 作废等)
+     * 正常使用只需#processEvent.key=='leave1'
+     * 示例为了方便则使用startsWith匹配了全部示例key
+     *
+     * @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);
+    }
+
     /**
      * 执行办理任务监听
      *
      * @param processTaskEvent 参数
      */
     @EventListener(condition = "#processTaskEvent.keyNode=='leave1_Activity_14633hx'")
-    public void leave1Task(ProcessTaskEvent processTaskEvent) {
+    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);
-    }
 }