From b8cc44cd23457fdfe14cb001e0f3cd581a2b4dc0 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Fri, 7 Jul 2023 17:17:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E7=94=B3=E8=AF=B7=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java index 7dc0458..b06e90c 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java @@ -141,17 +141,19 @@ public class DelayedApplyManage { // 判断当前项目是否已经开启了延期申请并且没有审批完成 ProjectDelayApply delayApply = projectDelayApplyService.getOne(Wrappers.lambdaQuery(ProjectDelayApply.class) .eq(ProjectDelayApply::getProjectId, w.getId()) + .orderByDesc(ProjectDelayApply::getCreateOn) .last("limit 1")); String instCode = delayApply.getInstanceId(); - // 获取流程通过后的流程实例 + // 获取流程实例 HistoricProcessInstance newInstance = historyService.createHistoricProcessInstanceQuery() .processInstanceId(instCode) .singleResult(); ProjectInst projectInst = projectInstService.getOne(Wrappers.lambdaQuery(ProjectInst.class) .eq(ProjectInst::getInstCode, instCode)); Integer instType = projectInst.getInstType(); + // 延期申请流程还未审核结束 if (InstTypeEnum.APPLY_DELAY.getCode().equals(instType) && - !HisProInsEndActId.END.equals(newInstance.getEndActivityId())){ + Objects.isNull(newInstance.getEndActivityId())){ item.setCanDelayApply(Boolean.FALSE); } // 如果是延期申请审核被驳回,设置项目可以申请延期申报