From b24e024f386e7f25a071b58e9267a2c19f20ba1e Mon Sep 17 00:00:00 2001 From: luohairen <3399054449@qq.com> Date: 星期二, 10 十二月 2024 18:11:47 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- business/src/main/java/com/ycl/service/ProjectProcessService.java | 48 +++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 45 insertions(+), 3 deletions(-) diff --git a/business/src/main/java/com/ycl/service/ProjectProcessService.java b/business/src/main/java/com/ycl/service/ProjectProcessService.java index e200d09..ea82840 100644 --- a/business/src/main/java/com/ycl/service/ProjectProcessService.java +++ b/business/src/main/java/com/ycl/service/ProjectProcessService.java @@ -5,6 +5,9 @@ import com.ycl.common.base.Result; import com.ycl.domain.form.ProjectProcessForm; import com.ycl.domain.query.ProjectProcessQuery; +import com.ycl.domain.query.TaskQuery; +import com.ycl.domain.vo.CustomerTaskVO; + import java.util.List; /** @@ -23,11 +26,12 @@ Result page(ProjectProcessQuery query); /** - * 鏍规嵁id鏌ユ壘 - * @param id + * 鏍规嵁椤圭洰id鏌ユ壘 + * @param projectId + * @param processId * @return */ - Result detail(Integer id); + Result detail(Long projectId, String processId); /** * 椤圭洰璁剧疆娴佺▼ @@ -36,4 +40,42 @@ * @return */ Result projectSetProcess(ProjectProcessForm form); + + /** + * 鍚姩娴佺▼ + * + * @param processDefId 娴佺▼瀹氫箟id + * @param projectId 椤圭洰id锛屼綔涓轰笟鍔d瀛樺叆activity琛� + * @return + */ + Result startProcess(Long projectId, String processDefId); + + /** + * 鏌ヨ浠诲姟鍒楄〃 + * + * @param query + * @return + */ + Result taskList(TaskQuery query); + + /** + * 鑾峰彇鎵�鏈夌殑寰呭姙浠诲姟 + * + * @param taskName + * @param pageSize + * @param pageNum + * @param result + */ + void getAllTodoTask(String taskName, int pageSize, int pageNum, Result result); + + Result detailByProcessInsId(TaskQuery query); + + /** + * 鏌ヨ鏄惁鏄鎵逛换鍔� + * + * @param processDefinitionId 娴佺▼瀹氫箟id + * @param processDefinitionId 浠诲姟id + * @return + */ + Result taskIsAuditing(String processDefinitionId, String taskId); } -- Gitblit v1.8.0