延期申请驳回重新提交修改

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;

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);

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());

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(),