From b29b4008fcc85a8184d30af44dab540d50a14698 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 08 四月 2025 14:03:14 +0800
Subject: [PATCH] 查询流程图中的历史任务去重、修改任务相关完善

---
 business/src/main/java/com/ycl/service/ProjectProcessService.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/business/src/main/java/com/ycl/service/ProjectProcessService.java b/business/src/main/java/com/ycl/service/ProjectProcessService.java
index b01847d..9803243 100644
--- a/business/src/main/java/com/ycl/service/ProjectProcessService.java
+++ b/business/src/main/java/com/ycl/service/ProjectProcessService.java
@@ -1,5 +1,7 @@
 package com.ycl.service;
 
+import com.ycl.common.core.domain.AjaxResult;
+import com.ycl.common.core.domain.R;
 import com.ycl.domain.entity.ProjectProcess;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ycl.common.base.Result;
@@ -7,6 +9,8 @@
 import com.ycl.domain.query.ProjectProcessQuery;
 import com.ycl.domain.query.TaskQuery;
 import com.ycl.domain.vo.CustomerTaskVO;
+import com.ycl.domain.vo.IndexMsgCountVO;
+import com.ycl.system.domain.base.AbsQuery;
 
 import java.util.List;
 
@@ -27,11 +31,10 @@
 
     /**
      * 鏍规嵁椤圭洰id鏌ユ壘
-     * @param projectId
-     * @param processId
+     * @param form
      * @return
      */
-    Result detail(Long projectId, String processId);
+    Result detail(ProjectProcessForm form);
 
     /**
      * 椤圭洰璁剧疆娴佺▼
@@ -44,11 +47,10 @@
     /**
      * 鍚姩娴佺▼
      *
-     * @param processDefId  娴佺▼瀹氫箟id
-     * @param projectId  椤圭洰id锛屼綔涓轰笟鍔d瀛樺叆activity琛�
+     * @param form
      * @return
      */
-    Result startProcess(Long projectId, String processDefId);
+    Result startProcess(ProjectProcessForm form);
 
     /**
      * 鏌ヨ浠诲姟鍒楄〃
@@ -106,6 +108,14 @@
     Result taskJump(TaskJumpForm form);
 
     /**
+     * 瀹圭己浠诲姟
+     *
+     * @param form
+     * @return
+     */
+    Result taskWait(TaskWaitForm form);
+
+    /**
      * 鐫e姙浠诲姟
      *
      * @param form
@@ -120,4 +130,40 @@
      * @return
      */
     Result taskHangup(TaskHangupForm form);
+
+    /**
+     * 鍙栨秷鎸傝捣浠诲姟
+     *
+     * @param form
+     * @return
+     */
+    Result cancelTaskHangup(TaskHangupForm form);
+
+    /**
+     * 浠诲姟鍙戣捣鍗忓悓鍔炵悊
+     *
+     * @param form
+     * @return
+     */
+    Result taskTeamwork(TaskTeamWorkForm form);
+
+    Result getProcessMsg(AbsQuery query);
+
+    /**
+     * 鑾峰彇棣栭〉瀹圭己浠诲姟
+     *
+     * @param s
+     * @param pageSize
+     * @param currentPage
+     * @param result
+     */
+    void getIndexWaitTask(String s, int pageSize, int currentPage, Result result);
+
+    /**
+     * 淇敼宸插畬鎴愮殑浠诲姟
+     *
+     * @param vo
+     * @return
+     */
+    Result editFinishedTask(EditFinishedTaskForm vo);
 }

--
Gitblit v1.8.0