From a48ad3fa3ea36577d587b19c0b272e674773b813 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Fri, 7 Jul 2023 16:11:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E7=94=B3=E8=AF=B7=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E9=87=8D=E6=96=B0=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pmapi/projectdeclared/controller/DelayedApplyController.java | 1 + .../pmapi/projectdeclared/manage/DelayedApplyManage.java | 5 +++++ .../com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java | 2 +- .../com/ningdatech/pmapi/todocenter/manage/HandlerManage.java | 8 ++++++++ 4 files changed, 15 insertions(+), 1 deletion(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java index be83cc0..22db56a 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java @@ -4,6 +4,7 @@ import com.ningdatech.basic.model.PageVo; import com.ningdatech.log.annotation.WebLog; import com.ningdatech.pmapi.common.util.ExcelDownUtil; import com.ningdatech.pmapi.projectdeclared.manage.DelayedApplyManage; +import com.ningdatech.pmapi.projectdeclared.model.dto.DefaultDeclaredDTO; import com.ningdatech.pmapi.projectdeclared.model.dto.DelayedApplyDTO; import com.ningdatech.pmapi.projectdeclared.model.vo.DelayedApplyVO; import com.ningdatech.pmapi.projectlib.model.req.ProjectListReq; 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 65f193c..79079b6 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 @@ -151,6 +151,11 @@ public class DelayedApplyManage { !HisProInsEndActId.END.equals(newInstance.getEndActivityId())){ item.setCanDelayApply(Boolean.FALSE); } + // 如果是延期申请审核被驳回,设置项目可以申请延期申报 + else if (InstTypeEnum.APPLY_DELAY.getCode().equals(instType) && + HisProInsEndActId.REJECT.equals(newInstance.getEndActivityId())) { + item.setCanDelayApply(Boolean.TRUE); + } return item; }); return PageVo.of(records, total); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java index 51729ff..feaa409 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java @@ -715,7 +715,7 @@ public class ProjectLibManage { project.setUpdateOn(LocalDateTime.now()); projectService.updateById(project); - // 保存延期申请信息 + // 保存延期申请信息和申请延期前项目建设周期和验收时间 ProjectDelayApply projectDelayApply = new ProjectDelayApply(); projectDelayApply.setDelayTime(dto.getDelayedMonth()); projectDelayApply.setDelayApplyFile(dto.getSupportingMaterials()); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java index 58f197a..5850b0e 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java @@ -267,6 +267,14 @@ public class HandlerManage { if (!InstTypeEnum.APPLY_DELAY.getCode().equals(instType) && !InstTypeEnum.APPLY_BORROW.getCode().equals(instType)) { // 更新项目状态和流程状态 updateRejectProjectStatus(userId, declaredProject, instType); + }else { + // 如果是延期申请审核被驳回,恢复项目建设周期和验收时间 + if (InstTypeEnum.APPLY_DELAY.getCode().equals(instType)){ + ProjectDelayApply projectDelayApply = projectDelayApplyService.getOne(Wrappers.lambdaQuery(ProjectDelayApply.class) + .eq(ProjectDelayApply::getProjectId, declaredProject.getId()) + .eq(ProjectDelayApply::getInstanceId, instanceId)); + + } } //发送消息 noticeManage.sendNotice(instance.getStartUserId(),userId,declaredProject,instance.getProcessDefinitionName(),