From f8ce7aa161ef2ef316357ead8208bc60de938ead Mon Sep 17 00:00:00 2001 From: zxl <763096477@qq.com> Date: 星期一, 24 三月 2025 09:36:02 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/service/ProjectProcessService.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 47 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 facc624..f56d3db 100644 --- a/business/src/main/java/com/ycl/service/ProjectProcessService.java +++ b/business/src/main/java/com/ycl/service/ProjectProcessService.java @@ -1,5 +1,6 @@ package com.ycl.service; +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 +8,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 +30,10 @@ /** * 鏍规嵁椤圭洰id鏌ユ壘 - * @param projectId - * @param processId + * @param form * @return */ - Result detail(Long projectId, String processId); + Result detail(ProjectProcessForm form); /** * 椤圭洰璁剧疆娴佺▼ @@ -44,11 +46,10 @@ /** * 鍚姩娴佺▼ * - * @param processDefId 娴佺▼瀹氫箟id - * @param projectId 椤圭洰id锛屼綔涓轰笟鍔d瀛樺叆activity琛� + * @param form * @return */ - Result startProcess(Long projectId, String processDefId); + Result startProcess(ProjectProcessForm form); /** * 鏌ヨ浠诲姟鍒楄〃 @@ -105,5 +106,45 @@ */ Result taskJump(TaskJumpForm form); + /** + * 瀹圭己浠诲姟 + * + * @param form + * @return + */ + Result taskWait(TaskWaitForm form); + + /** + * 鐫e姙浠诲姟 + * + * @param form + * @return + */ Result taskSupervise(TaskSuperviseForm form); + + /** + * 鎸傝捣浠诲姟 + * + * @param form + * @return + */ + Result taskHangup(TaskHangupForm form); + + /** + * 鍙栨秷鎸傝捣浠诲姟 + * + * @param form + * @return + */ + Result cancelTaskHangup(TaskHangupForm form); + + /** + * 浠诲姟鍙戣捣鍗忓悓鍔炵悊 + * + * @param form + * @return + */ + Result taskTeamwork(TaskTeamWorkForm form); + + Result getProcessMsg(AbsQuery query); } -- Gitblit v1.8.0