From 12a23f193d4d5a41e25e274553d75eb9eb4e2ec4 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Tue, 11 Jul 2023 15:57:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E5=A4=A7=E9=A1=B9=E7=9B=AE=E8=81=94?= =?UTF-8?q?=E5=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/scheduler/contants/TaskContant.java | 3 ++- .../pmapi/scheduler/task/CheckProvincialReviewResultTask.java | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/contants/TaskContant.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/contants/TaskContant.java index ca84a7c..2316121 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/contants/TaskContant.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/contants/TaskContant.java @@ -40,7 +40,8 @@ public interface TaskContant { } class ProvinceReview{ - public static final String END_NODE_ID = "结束"; + + public static final String END_STEP = "流程结束"; } } diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java index 1dbd913..9edd232 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CheckProvincialReviewResultTask.java @@ -83,13 +83,14 @@ public class CheckProvincialReviewResultTask { //取到最后一个审批元素 ProcessCommentRes lastProcessComment = processComments.get(processComments.size() - 1); //最后一个 节点 nodeId 是结束 说明已经批完 - if(StringUtils.isNotBlank(lastProcessComment.getNodeId()) && - TaskContant.ProvinceReview.END_NODE_ID.equals(lastProcessComment.getNodeId())){ + if(StringUtils.isNotBlank(lastProcessComment.getStepName()) && + TaskContant.ProvinceReview.END_STEP.equals(lastProcessComment.getStepName())){ //在省级联审 才调状态机 否则 只改变 联审结果 if(ProjectStatusEnum.JOINT_REVIEW_BY_PROVINCIAL_DEPARTMENTS.getCode().equals( project.getStatus())){ stateMachineUtils.pass(project); } + log.info("已经审批完成 进入下一状态"); } project.setUpdateOn(LocalDateTime.now()); //保存审核结果