重大项目联审

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 = "流程结束";
     }
 }

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());
                         //保存审核结果