Merge branch '20230807_ls2_delay_optimize' of http://git.ningdatech.com/liushuai/project-management into dev

 Conflicts:

	pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/controller/DelayedApplyController.java

@@ -4,7 +4,6 @@ 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;
@@ -16,6 +15,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletResponse;
+import java.util.List;
 
 /**
  * @Classname DelayedProjectController
@@ -39,6 +39,12 @@ public class DelayedApplyController {
         return delayedApplyManage.projectLibList(req);
     }
 
+    @ApiOperation(value = "查看某个项目的延期列表", notes = "查看某个项目的延期列表")
+    @GetMapping("/delay-list/{projectId}")
+    public List<DelayedApplyVO> delayList(@PathVariable Long projectId) {
+        return delayedApplyManage.delayList(projectId);
+    }
+
     @ApiOperation(value = "延期的内容详情", notes = "延期的内容详情")
     @GetMapping("/detail/{projectId}")
     public DelayedApplyVO detailByProjectId(@PathVariable Long projectId) {

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/DelayedApplyManage.java

@@ -304,4 +304,22 @@ public class DelayedApplyManage {
         }
         return BeanUtil.copyProperties(delayApply,DelayedApplyVO.class);
     }
+
+    /**
+     * 查看某个项目的 延期列表
+     * @param projectId
+     * @return
+     */
+    public List<DelayedApplyVO> delayList(Long projectId) {
+        List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectId);
+        List<ProjectDelayApply> delays = projectDelayApplyService.list(Wrappers.lambdaQuery(ProjectDelayApply.class)
+                .in(ProjectDelayApply::getProjectId, allVersionProjectId));
+
+        if(CollUtil.isEmpty(delays)){
+            return Collections.emptyList();
+        }
+
+        return delays.stream().map(d -> BeanUtil.copyProperties(d,DelayedApplyVO.class))
+                .collect(Collectors.toList());
+    }
 }

pmapi/src/main/java/com/ningdatech/pmapi/projectdeclared/manage/OperationManage.java

@@ -81,6 +81,8 @@ public class OperationManage {
         entity.setProjectCode(project.getProjectCode());
         entity.setUpdateOn(LocalDateTime.now());
         entity.setUpdateBy(user.getUsername());
+        //强制放入 计划终验时间
+        entity.setFinalInspectionDate(project.getPlanAcceptanceTime());
         if(operationService.saveOrUpdate(entity)){
             stateMachineUtils.pass(project);
             project.setUpdateOn(LocalDateTime.now());

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java

@@ -164,12 +164,18 @@ public class AnnualPlanLibManage {
         //计划出 计划验收时间
         LocalDateTime planAcceptanceTime = getPlanAcceptanceTime(req);
         LambdaUpdateWrapper<Project> update =
-            Wrappers.lambdaUpdate(Project.class).set(Project::getApprovalAmount, req.getApprovedAmount())
-                .set(Project::getApprovedFile, req.getApprovedFileId()).set(Project::getBuildCycle, req.getBuildCycle())
+            Wrappers.lambdaUpdate(Project.class)
+                .set(Project::getApprovalAmount, req.getApprovedAmount())
+                .set(Project::getApprovedFile, req.getApprovedFileId())
+                .set(Project::getBuildCycle, req.getBuildCycle())
+                .set(Project::getOriginBuildCycle,req.getBuildCycle())
                 .set(Project::getApprovedConstructionPlanFile, req.getBuildPlanFileId())
-                .set(Project::getApprovalDate, req.getApprovedDate()).set(Project::getStatus, project.getStatus())
+                .set(Project::getApprovalDate, req.getApprovedDate())
+                .set(Project::getStatus, project.getStatus())
                 .set(Project::getStage, project.getStage())
                 .set(Objects.nonNull(planAcceptanceTime),Project::getPlanAcceptanceTime,planAcceptanceTime)
+                //记录原始的 计划验收时间
+                .set(Objects.nonNull(planAcceptanceTime),Project::getOriginPlanAcceptanceTime,planAcceptanceTime)
                 .eq(Project::getId, req.getProjectId());
         projectService.update(update);
     }

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectLibManage.java

@@ -240,6 +240,213 @@ public class ProjectLibManage {
     }
 
     /**
+     * @param projectId 项目详情
+     * @return com.ningdatech.pmapi.projectlib.model.entity.vo.ProjectDetailVO
+     * @author ZPF
+     * @since 2023/02/11 11:15
+     */
+    public ProjectDetailVO getProjectDetail(Long projectId) {
+        // 查询最新的项目申报信息
+        Project projectInfo = projectService.getNewProject(projectId);
+        if (Objects.isNull(projectInfo)) {
+            return null;
+        }
+        ProjectDetailVO vo = new ProjectDetailVO();
+        BeanUtils.copyProperties(projectInfo, vo);
+        vo.buildDynamicForm(projectInfo.getDynamicForm());
+        // 查询应用
+        List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                .eq(ProjectApplication::getProjectCode, vo.getProjectCode())
+                .eq(ProjectApplication::getIsConstruct, projectInfo.getIsConstruct())
+                .eq(ProjectApplication::getProjectVersion, projectInfo.getVersion()));
+
+        Optional.ofNullable(applications).ifPresent(apps ->
+                vo.setProjectApplications(CollUtils.convert(apps,
+                        ProjectHelper::convertVO)
+                ));
+
+        List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo);
+        //查询采购备案
+        List<Purchase> purchases = purchaseService.listByProjectId(projectId);
+        vo.setPurchases(BeanUtil.copyToList(purchases, PurchaseVO.class));
+
+        //查询合同备案
+        Contract contract = contractService.getOne(Wrappers.lambdaQuery(Contract.class)
+                .in(Contract::getProjectId, allVersionProjectId)
+                .last(BizConst.LIMIT_1));
+        ContractVO contractVO = BeanUtil.copyProperties(contract, ContractVO.class);
+        vo.setContract(contractVO);
+        List<PaymentPlan> payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class)
+                .in(PaymentPlan::getProjectId, allVersionProjectId)
+                .orderByAsc(PaymentPlan::getPaymentTime));
+        if (Objects.nonNull(contractVO)) {
+            contractVO.setPayments(convertPayments(payments,
+                    contractVO.getTotalAmount()));
+        }
+
+        //查询实施信息
+        Operation operation = operationService.getOne(Wrappers.lambdaQuery(Operation.class)
+                .in(Operation::getProjectId, allVersionProjectId)
+                .orderByAsc(Operation::getCreateOn)
+                .last(BizConst.LIMIT_1));
+        vo.setOperation(BeanUtil.copyProperties(operation, OperationVO.class));
+
+        SafetyMonitorVO safetyVo = new SafetyMonitorVO();
+        //查询风险监测
+        List<SupplierSafetyQualification> ssq = supplierSafetyQualificationService.list(Wrappers.lambdaQuery(SupplierSafetyQualification.class)
+                .eq(SupplierSafetyQualification::getProjectCode, projectInfo.getProjectCode()));
+        if(CollUtil.isNotEmpty(ssq)){
+            safetyVo.setSupplierSafetyQualification(ssq.stream()
+                    .map(s -> BeanUtil.copyProperties(s, SupplierSafetyQualificationVO.class))
+                    .collect(Collectors.toList()));
+        }
+        vo.setSafetyInfo(safetyVo);
+
+        List<PersonSafetyInfo> psi = personSafetyInfoService.list(Wrappers.lambdaQuery(PersonSafetyInfo.class)
+                .eq(PersonSafetyInfo::getProjectCode,  projectInfo.getProjectCode()));
+        if(CollUtil.isNotEmpty(psi)){
+            safetyVo.setPersonSafetyInfo(psi.stream()
+                    .map(p -> BeanUtil.copyProperties(p, PersonSafetyInfoVO.class))
+                    .collect(Collectors.toList()));
+        }
+
+        //查询初验信息
+        List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
+                .in(PreInsAcceptancePerson::getProjectId, allVersionProjectId)
+                .orderByAsc(PreInsAcceptancePerson::getCreateOn));
+        vo.setAcceptancePersons(convertPersons(acceptancePersons));
+
+        //查询终验信息
+        //查询年度投资金额 要是已验收的项目
+        if (ProjectStatusEnum.ACCEPTED.getCode().equals(projectInfo.getStatus())) {
+            List<AnnualAmountVO> annualAmounts = Lists.newArrayList();
+            annualAmounts.add(AnnualAmountVO.builder()
+                    .projectId(projectInfo.getId())
+                    .projectYear(projectInfo.getProjectYear())
+                    .annualAmount(projectInfo.getAnnualPlanAmount())
+                    .build());
+            List<ProjectRenewalFundDeclaration> renewalDeclarations = renewalFundDeclarationService.list(Wrappers.lambdaQuery(ProjectRenewalFundDeclaration.class)
+                    .eq(ProjectRenewalFundDeclaration::getProjectId, vo.getId())
+                    .orderByAsc(ProjectRenewalFundDeclaration::getProjectYear));
+            Optional.ofNullable(renewalDeclarations).ifPresent(declarations ->
+                    declarations.forEach(declaration -> {
+                        annualAmounts.add(AnnualAmountVO.builder()
+                                .projectId(projectInfo.getId())
+                                .projectYear(declaration.getProjectYear())
+                                .annualAmount(declaration.getAnnualPaymentAmount())
+                                .build());
+                    })
+            );
+            vo.setAnnualAccumulateAmountList(annualAmounts);
+        }
+        // 处理文件名
+        List<Long> fileIdList = new ArrayList<>();
+        BizUtils.notBlank(vo.getApprovedFile(), w -> fileIdList.add(Long.parseLong(w)));
+        BizUtils.notBlank(vo.getApprovedConstructionPlanFile(), w -> fileIdList.add(Long.parseLong(w)));
+        if (!fileIdList.isEmpty()) {
+            List<File> files = fileService.listByIds(fileIdList);
+            Map<String, String> fileMap = CollUtils.listToMap(files, w -> w.getId().toString(), File::getOriginalFileName);
+            vo.setApprovedFileName(fileMap.get(vo.getApprovedFile()));
+            vo.setApprovedConstructionPlanFileName(fileMap.get(vo.getApprovedConstructionPlanFile()));
+        }
+        return vo;
+    }
+
+    /**
+     * @param projectId 项目详情 不查询最新版本
+     * @return com.ningdatech.pmapi.projectlib.model.entity.vo.ProjectDetailVO
+     * @author ZPF
+     * @since 2023/02/11 11:15
+     */
+    public ProjectDetailVO getProjectDetailThisVersion(Long projectId) {
+        // 查询最新的项目申报信息
+        Project projectInfo = projectService.getById(projectId);
+        if (Objects.isNull(projectInfo)) {
+            return null;
+        }
+        ProjectDetailVO vo = new ProjectDetailVO();
+        BeanUtils.copyProperties(projectInfo, vo);
+        vo.buildDynamicForm(projectInfo.getDynamicForm());
+        // 查询应用
+        List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
+                .eq(ProjectApplication::getProjectCode, vo.getProjectCode())
+                .eq(ProjectApplication::getIsConstruct, projectInfo.getIsConstruct())
+                .eq(ProjectApplication::getProjectVersion, projectInfo.getVersion()));
+
+        Optional.ofNullable(applications).ifPresent(apps ->
+                vo.setProjectApplications(CollUtils.convert(apps,
+                        ProjectHelper::convertVO)
+                ));
+
+        //审批信息
+        ProcessDetailReq req = new ProcessDetailReq();
+        req.setInstanceId(projectInfo.getInstCode());
+        req.setProjectId(projectId);
+        vo.setProcess(todoService.getProcessDetail(req));
+
+        List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo);
+        //查询采购备案
+        List<Purchase> purchases = purchaseService.listByProjectId(projectId);
+        vo.setPurchases(BeanUtil.copyToList(purchases, PurchaseVO.class));
+
+        //查询合同备案
+        Contract contract = contractService.getOne(Wrappers.lambdaQuery(Contract.class)
+                .in(Contract::getProjectId, allVersionProjectId)
+                .last(BizConst.LIMIT_1));
+        ContractVO contractVO = BeanUtil.copyProperties(contract, ContractVO.class);
+        vo.setContract(contractVO);
+        List<PaymentPlan> payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class)
+                .in(PaymentPlan::getProjectId, allVersionProjectId)
+                .orderByAsc(PaymentPlan::getPaymentTime));
+        if (Objects.nonNull(contractVO)) {
+            contractVO.setPayments(convertPayments(payments,
+                    contractVO.getTotalAmount()));
+        }
+
+
+        //查询初验信息
+        List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
+                .in(PreInsAcceptancePerson::getProjectId, allVersionProjectId)
+                .orderByAsc(PreInsAcceptancePerson::getCreateOn));
+        vo.setAcceptancePersons(convertPersons(acceptancePersons));
+
+        //查询终验信息
+        //查询年度投资金额 要是已验收的项目
+        if (ProjectStatusEnum.ACCEPTED.getCode().equals(projectInfo.getStatus())) {
+            List<AnnualAmountVO> annualAmounts = Lists.newArrayList();
+            annualAmounts.add(AnnualAmountVO.builder()
+                    .projectId(projectInfo.getId())
+                    .projectYear(projectInfo.getProjectYear())
+                    .annualAmount(projectInfo.getAnnualPlanAmount())
+                    .build());
+            List<ProjectRenewalFundDeclaration> renewalDeclarations = renewalFundDeclarationService.list(Wrappers.lambdaQuery(ProjectRenewalFundDeclaration.class)
+                    .eq(ProjectRenewalFundDeclaration::getProjectId, vo.getId())
+                    .orderByAsc(ProjectRenewalFundDeclaration::getProjectYear));
+            Optional.ofNullable(renewalDeclarations).ifPresent(declarations ->
+                    declarations.forEach(declaration -> {
+                        annualAmounts.add(AnnualAmountVO.builder()
+                                .projectId(projectInfo.getId())
+                                .projectYear(declaration.getProjectYear())
+                                .annualAmount(declaration.getAnnualPaymentAmount())
+                                .build());
+                    })
+            );
+            vo.setAnnualAccumulateAmountList(annualAmounts);
+        }
+        // 处理文件名
+        List<Long> fileIdList = new ArrayList<>();
+        BizUtils.notBlank(vo.getApprovedFile(), w -> fileIdList.add(Long.parseLong(w)));
+        BizUtils.notBlank(vo.getApprovedConstructionPlanFile(), w -> fileIdList.add(Long.parseLong(w)));
+        if (!fileIdList.isEmpty()) {
+            List<File> files = fileService.listByIds(fileIdList);
+            Map<String, String> fileMap = CollUtils.listToMap(files, w -> w.getId().toString(), File::getOriginalFileName);
+            vo.setApprovedFileName(fileMap.get(vo.getApprovedFile()));
+            vo.setApprovedConstructionPlanFileName(fileMap.get(vo.getApprovedConstructionPlanFile()));
+        }
+        return vo;
+    }
+
+    /**
      * 申报新项目时 保存项目信息和其它相关联的信息
      *
      * @param projectDto
@@ -639,213 +846,6 @@ public class ProjectLibManage {
     }
 
     /**
-     * @param projectId 项目详情
-     * @return com.ningdatech.pmapi.projectlib.model.entity.vo.ProjectDetailVO
-     * @author ZPF
-     * @since 2023/02/11 11:15
-     */
-    public ProjectDetailVO getProjectDetail(Long projectId) {
-        // 查询最新的项目申报信息
-        Project projectInfo = projectService.getNewProject(projectId);
-        if (Objects.isNull(projectInfo)) {
-            return null;
-        }
-        ProjectDetailVO vo = new ProjectDetailVO();
-        BeanUtils.copyProperties(projectInfo, vo);
-        vo.buildDynamicForm(projectInfo.getDynamicForm());
-        // 查询应用
-        List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
-                .eq(ProjectApplication::getProjectCode, vo.getProjectCode())
-                .eq(ProjectApplication::getIsConstruct, projectInfo.getIsConstruct())
-                .eq(ProjectApplication::getProjectVersion, projectInfo.getVersion()));
-
-        Optional.ofNullable(applications).ifPresent(apps ->
-                vo.setProjectApplications(CollUtils.convert(apps,
-                        ProjectHelper::convertVO)
-                ));
-
-        List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo);
-        //查询采购备案
-        List<Purchase> purchases = purchaseService.listByProjectId(projectId);
-        vo.setPurchases(BeanUtil.copyToList(purchases, PurchaseVO.class));
-
-        //查询合同备案
-        Contract contract = contractService.getOne(Wrappers.lambdaQuery(Contract.class)
-                .in(Contract::getProjectId, allVersionProjectId)
-                .last(BizConst.LIMIT_1));
-        ContractVO contractVO = BeanUtil.copyProperties(contract, ContractVO.class);
-        vo.setContract(contractVO);
-        List<PaymentPlan> payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class)
-                .in(PaymentPlan::getProjectId, allVersionProjectId)
-                .orderByAsc(PaymentPlan::getPaymentTime));
-        if (Objects.nonNull(contractVO)) {
-            contractVO.setPayments(convertPayments(payments,
-                    contractVO.getTotalAmount()));
-        }
-
-        //查询实施信息
-        Operation operation = operationService.getOne(Wrappers.lambdaQuery(Operation.class)
-                .in(Operation::getProjectId, allVersionProjectId)
-                .orderByAsc(Operation::getCreateOn)
-                .last(BizConst.LIMIT_1));
-        vo.setOperation(BeanUtil.copyProperties(operation, OperationVO.class));
-
-        SafetyMonitorVO safetyVo = new SafetyMonitorVO();
-        //查询风险监测
-        List<SupplierSafetyQualification> ssq = supplierSafetyQualificationService.list(Wrappers.lambdaQuery(SupplierSafetyQualification.class)
-                .eq(SupplierSafetyQualification::getProjectCode, projectInfo.getProjectCode()));
-        if(CollUtil.isNotEmpty(ssq)){
-            safetyVo.setSupplierSafetyQualification(ssq.stream()
-                    .map(s -> BeanUtil.copyProperties(s, SupplierSafetyQualificationVO.class))
-                    .collect(Collectors.toList()));
-        }
-        vo.setSafetyInfo(safetyVo);
-
-        List<PersonSafetyInfo> psi = personSafetyInfoService.list(Wrappers.lambdaQuery(PersonSafetyInfo.class)
-                .eq(PersonSafetyInfo::getProjectCode,  projectInfo.getProjectCode()));
-        if(CollUtil.isNotEmpty(psi)){
-            safetyVo.setPersonSafetyInfo(psi.stream()
-                    .map(p -> BeanUtil.copyProperties(p, PersonSafetyInfoVO.class))
-                    .collect(Collectors.toList()));
-        }
-
-        //查询初验信息
-        List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
-                .in(PreInsAcceptancePerson::getProjectId, allVersionProjectId)
-                .orderByAsc(PreInsAcceptancePerson::getCreateOn));
-        vo.setAcceptancePersons(convertPersons(acceptancePersons));
-
-        //查询终验信息
-        //查询年度投资金额 要是已验收的项目
-        if (ProjectStatusEnum.ACCEPTED.getCode().equals(projectInfo.getStatus())) {
-            List<AnnualAmountVO> annualAmounts = Lists.newArrayList();
-            annualAmounts.add(AnnualAmountVO.builder()
-                    .projectId(projectInfo.getId())
-                    .projectYear(projectInfo.getProjectYear())
-                    .annualAmount(projectInfo.getAnnualPlanAmount())
-                    .build());
-            List<ProjectRenewalFundDeclaration> renewalDeclarations = renewalFundDeclarationService.list(Wrappers.lambdaQuery(ProjectRenewalFundDeclaration.class)
-                    .eq(ProjectRenewalFundDeclaration::getProjectId, vo.getId())
-                    .orderByAsc(ProjectRenewalFundDeclaration::getProjectYear));
-            Optional.ofNullable(renewalDeclarations).ifPresent(declarations ->
-                    declarations.forEach(declaration -> {
-                        annualAmounts.add(AnnualAmountVO.builder()
-                                .projectId(projectInfo.getId())
-                                .projectYear(declaration.getProjectYear())
-                                .annualAmount(declaration.getAnnualPaymentAmount())
-                                .build());
-                    })
-            );
-            vo.setAnnualAccumulateAmountList(annualAmounts);
-        }
-        // 处理文件名
-        List<Long> fileIdList = new ArrayList<>();
-        BizUtils.notBlank(vo.getApprovedFile(), w -> fileIdList.add(Long.parseLong(w)));
-        BizUtils.notBlank(vo.getApprovedConstructionPlanFile(), w -> fileIdList.add(Long.parseLong(w)));
-        if (!fileIdList.isEmpty()) {
-            List<File> files = fileService.listByIds(fileIdList);
-            Map<String, String> fileMap = CollUtils.listToMap(files, w -> w.getId().toString(), File::getOriginalFileName);
-            vo.setApprovedFileName(fileMap.get(vo.getApprovedFile()));
-            vo.setApprovedConstructionPlanFileName(fileMap.get(vo.getApprovedConstructionPlanFile()));
-        }
-        return vo;
-    }
-
-    /**
-     * @param projectId 项目详情 不查询最新版本
-     * @return com.ningdatech.pmapi.projectlib.model.entity.vo.ProjectDetailVO
-     * @author ZPF
-     * @since 2023/02/11 11:15
-     */
-    public ProjectDetailVO getProjectDetailThisVersion(Long projectId) {
-        // 查询最新的项目申报信息
-        Project projectInfo = projectService.getById(projectId);
-        if (Objects.isNull(projectInfo)) {
-            return null;
-        }
-        ProjectDetailVO vo = new ProjectDetailVO();
-        BeanUtils.copyProperties(projectInfo, vo);
-        vo.buildDynamicForm(projectInfo.getDynamicForm());
-        // 查询应用
-        List<ProjectApplication> applications = applicationService.list(Wrappers.lambdaQuery(ProjectApplication.class)
-                .eq(ProjectApplication::getProjectCode, vo.getProjectCode())
-                .eq(ProjectApplication::getIsConstruct, projectInfo.getIsConstruct())
-                .eq(ProjectApplication::getProjectVersion, projectInfo.getVersion()));
-
-        Optional.ofNullable(applications).ifPresent(apps ->
-                vo.setProjectApplications(CollUtils.convert(apps,
-                        ProjectHelper::convertVO)
-                ));
-
-        //审批信息
-        ProcessDetailReq req = new ProcessDetailReq();
-        req.setInstanceId(projectInfo.getInstCode());
-        req.setProjectId(projectId);
-        vo.setProcess(todoService.getProcessDetail(req));
-
-        List<Long> allVersionProjectId = projectService.getAllVersionProjectId(projectInfo);
-        //查询采购备案
-        List<Purchase> purchases = purchaseService.listByProjectId(projectId);
-        vo.setPurchases(BeanUtil.copyToList(purchases, PurchaseVO.class));
-
-        //查询合同备案
-        Contract contract = contractService.getOne(Wrappers.lambdaQuery(Contract.class)
-                .in(Contract::getProjectId, allVersionProjectId)
-                .last(BizConst.LIMIT_1));
-        ContractVO contractVO = BeanUtil.copyProperties(contract, ContractVO.class);
-        vo.setContract(contractVO);
-        List<PaymentPlan> payments = paymentPlanService.list(Wrappers.lambdaQuery(PaymentPlan.class)
-                .in(PaymentPlan::getProjectId, allVersionProjectId)
-                .orderByAsc(PaymentPlan::getPaymentTime));
-        if (Objects.nonNull(contractVO)) {
-            contractVO.setPayments(convertPayments(payments,
-                    contractVO.getTotalAmount()));
-        }
-
-
-        //查询初验信息
-        List<PreInsAcceptancePerson> acceptancePersons = acceptancePersonService.list(Wrappers.lambdaQuery(PreInsAcceptancePerson.class)
-                .in(PreInsAcceptancePerson::getProjectId, allVersionProjectId)
-                .orderByAsc(PreInsAcceptancePerson::getCreateOn));
-        vo.setAcceptancePersons(convertPersons(acceptancePersons));
-
-        //查询终验信息
-        //查询年度投资金额 要是已验收的项目
-        if (ProjectStatusEnum.ACCEPTED.getCode().equals(projectInfo.getStatus())) {
-            List<AnnualAmountVO> annualAmounts = Lists.newArrayList();
-            annualAmounts.add(AnnualAmountVO.builder()
-                    .projectId(projectInfo.getId())
-                    .projectYear(projectInfo.getProjectYear())
-                    .annualAmount(projectInfo.getAnnualPlanAmount())
-                    .build());
-            List<ProjectRenewalFundDeclaration> renewalDeclarations = renewalFundDeclarationService.list(Wrappers.lambdaQuery(ProjectRenewalFundDeclaration.class)
-                    .eq(ProjectRenewalFundDeclaration::getProjectId, vo.getId())
-                    .orderByAsc(ProjectRenewalFundDeclaration::getProjectYear));
-            Optional.ofNullable(renewalDeclarations).ifPresent(declarations ->
-                    declarations.forEach(declaration -> {
-                        annualAmounts.add(AnnualAmountVO.builder()
-                                .projectId(projectInfo.getId())
-                                .projectYear(declaration.getProjectYear())
-                                .annualAmount(declaration.getAnnualPaymentAmount())
-                                .build());
-                    })
-            );
-            vo.setAnnualAccumulateAmountList(annualAmounts);
-        }
-        // 处理文件名
-        List<Long> fileIdList = new ArrayList<>();
-        BizUtils.notBlank(vo.getApprovedFile(), w -> fileIdList.add(Long.parseLong(w)));
-        BizUtils.notBlank(vo.getApprovedConstructionPlanFile(), w -> fileIdList.add(Long.parseLong(w)));
-        if (!fileIdList.isEmpty()) {
-            List<File> files = fileService.listByIds(fileIdList);
-            Map<String, String> fileMap = CollUtils.listToMap(files, w -> w.getId().toString(), File::getOriginalFileName);
-            vo.setApprovedFileName(fileMap.get(vo.getApprovedFile()));
-            vo.setApprovedConstructionPlanFileName(fileMap.get(vo.getApprovedConstructionPlanFile()));
-        }
-        return vo;
-    }
-
-    /**
      * 获取项目初步方案详情
      *
      * @param projectId

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/entity/Project.java

@@ -325,6 +325,10 @@ public class Project implements Serializable {
     @Compare("建设周期（月）")
     private String buildCycle;
 
+    @ApiModelProperty("原始建设周期（月）")
+    @Compare("建设周期（月）")
+    private Integer originBuildCycle;
+
     @ApiModelProperty("建设方案文件")
     @Compare("建设方案文件")
     private String constructionPlanFile;
@@ -453,10 +457,17 @@ public class Project implements Serializable {
     @Compare("合同总金额")
     private BigDecimal contractAmount;
 
-    @ApiModelProperty("计划验收时间")
+    @ApiModelProperty("计划验收时间(有可能是延期后的)")
     @Compare("计划验收时间")
     private LocalDateTime planAcceptanceTime;
 
+    @ApiModelProperty("原本计划验收时间")
+    @Compare("原本计划验收时间")
+    private LocalDateTime originPlanAcceptanceTime;
+
+    @ApiModelProperty("延期月份数")
+    private Integer applyDelayMonths;
+
     @ApiModelProperty("申请延期佐证材料")
     private String applyDelayFile;
 

pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/ProjectDetailVO.java

@@ -3,6 +3,7 @@ package com.ningdatech.pmapi.projectlib.model.vo;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.annotation.JSONField;
 import com.ningdatech.basic.util.NdDateUtils;
+import com.ningdatech.pmapi.common.compare.Compare;
 import com.ningdatech.pmapi.common.util.BizUtils;
 import com.ningdatech.pmapi.portrait.model.vo.TagVO;
 import com.ningdatech.pmapi.projectdeclared.model.vo.ContractVO;
@@ -405,6 +406,17 @@ public class ProjectDetailVO {
     @ApiModelProperty("是否退回|驳回的项目版本")
     private Boolean isBackReject;
 
+    @ApiModelProperty("原本计划验收时间")
+    @Compare("原本计划验收时间")
+    private LocalDateTime originPlanAcceptanceTime;
+
+    @ApiModelProperty("延期月份数")
+    private Integer applyDelayMonths;
+
+    @ApiModelProperty("原始建设周期（月）")
+    @Compare("建设周期（月）")
+    private Integer originBuildCycle;
+
     public String getVersionStr() {
         if (Objects.nonNull(this.newest) && this.newest) {
             this.versionStr = "当前版本";

pmapi/src/main/java/com/ningdatech/pmapi/todocenter/manage/HandlerManage.java

@@ -256,6 +256,9 @@ public class HandlerManage {
         declaredProject.setInstCode(instanceId);
         declaredProject.setApplyDelayFile(delayApply.getDelayApplyFile());
         declaredProject.setApplyDelayReason(delayApply.getDelayApplyReason());
+        //增加总延期的月份
+        declaredProject.setApplyDelayMonths(Objects.nonNull(declaredProject.getApplyDelayMonths()) ?
+                declaredProject.getApplyDelayMonths() + delayApply.getDelayTime() : delayApply.getDelayTime());
         projectService.updateById(declaredProject);
     }