From 4788c0abe7193191b3ca024b0f5f8fed196294bd Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期三, 05 三月 2025 14:29:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into xizang-changyun

---
 ruoyi-system/src/main/java/com/ruoyi/system/service/StateProcessTemplateService.java |   18 ++++++++++++++++++
 1 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/StateProcessTemplateService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/StateProcessTemplateService.java
index 450d70e..fb31683 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/StateProcessTemplateService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/StateProcessTemplateService.java
@@ -1,6 +1,7 @@
 package com.ruoyi.system.service;
 
 
+import com.aizuda.bpm.engine.core.FlowCreator;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.common.basic.PageInfo;
@@ -25,11 +26,20 @@
      */
     Boolean start(ProcessStartBO processStartBO);
 
+    /**
+     * 启动流程
+     * @param processStartBO
+     * @return
+     */
+    Boolean startApplet(ProcessStartBO processStartBO);
+
     //待办
     PageInfo<ProcessTaskListVO> waitTaskPage(ProcessTaskListBO processTaskListBO);
+    PageInfo<ProcessTaskListVO> waitTaskPageApplet(ProcessTaskListBO processTaskListBO);
 
     //已办
     PageInfo<ProcessTaskListVO> dealTaskPage(ProcessTaskListBO processTaskListBO);
+    PageInfo<ProcessTaskListVO> dealTaskPageApplet(ProcessTaskListBO processTaskListBO);
 
     //抄送
     PageInfo<ProcessTaskListVO> copyTaskPage(ProcessTaskListBO processTaskListBO);
@@ -39,8 +49,16 @@
 
     //拒绝
     void refuse(ProcessRefuseBO processRefuseBO);
+    /**
+     * 流程实例撤销(用于错误发起审批申请,发起人主动撤销)
+     *
+     * @param instanceId  流程实例ID
+     */
+    void revoke(Long instanceId);
 
     PageInfo<ProcessTaskListVO> dealAndWaitTaskPage(ProcessTaskListBO processTemplatePageBO);
 
     ProcessDetailVO detail(String taskId);
+
+    PageInfo<ProcessTaskListVO> initiateTaskPage(ProcessTaskListBO processTemplatePageBO);
 }

--
Gitblit v1.7.1