From beeace34ccecf24541211888c3ee3bbd4b2023f2 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 22 Feb 2023 09:22:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=AF=A6=E6=83=85=E9=A1=B9=E7=9B=AEID?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/todocenter/controller/TodoCenterController.java | 7 +++---- .../com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java index 91cdf0c..58a090c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/controller/TodoCenterController.java @@ -63,10 +63,9 @@ public class TodoCenterController { * @param instanceId 流程实例ID * @return 流程进度及表单详情 */ - @GetMapping("/progress/{instanceId}/{projectId}") - public ProcessProgressDetailVo getProcessDetail(@PathVariable String instanceId, - @PathVariable Long projectId) { - return todoCenterManage.getProcessDetail(instanceId, projectId); + @GetMapping("/progress/{instanceId}") + public ProcessProgressDetailVo getProcessDetail(@PathVariable String instanceId) { + return todoCenterManage.getProcessDetail(instanceId); } /** diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index 9adbd89..fcc01c9 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -802,7 +802,7 @@ public class TodoCenterManage { * @param instanceId 流程实例ID * @return 流程进度及表单详情 */ - public ProcessProgressDetailVo getProcessDetail(String instanceId, Long projectId) { + public ProcessProgressDetailVo getProcessDetail(String instanceId) { ProcessProgressVo progressInstanceDetail = processInstanceService.getProgressInstanceDetail(null, instanceId); List progressInfo = progressInstanceDetail.getProgressInfo(); From 9b0f2a2451d1d789572bde6121e079a1b5c3747a Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Wed, 22 Feb 2023 09:38:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E8=AF=A6=E6=83=85=E9=A1=B9=E7=9B=AEID?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java index fcc01c9..bc0290a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/TodoCenterManage.java @@ -385,7 +385,7 @@ public class TodoCenterManage { managementService.executeCommand(new SaveCommentCmd(param.getTaskId(), param.getInstanceId(), String.valueOf(userId), JSONObject.toJSONString(param.getAuditInfo()))); } - // 如果流程状态是被退回状态，流程通过后，当前审核人一定不是最后一个审核人(至多是最后一个)，更新流程状态为审核中 + // 如果流程状态是被退回状态，流程通过后，进入下一个审核人，当前通过审核人一定不是最后一个审核人(下一个审核人至多是最后一个)，更新流程状态为审核中 if (ProcessStatusEnum.BE_BACKED.getCode().equals(declaredProject.getProcessStatus())) { // 通过该任务，流程到下一审核人处 taskService.complete(param.getTaskId(), var);