diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java index aff05ce..35dc25d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/ProjectRenewalFundManage.java @@ -103,7 +103,7 @@ public class ProjectRenewalFundManage { vo.setStage(project.getStage()); vo.setStatus(project.getStatus()); vo.setBuildOrgName(project.getBuildOrgName()); - vo.setAnnualPaymentAmount(project.getAnnualPlanAmount()); + vo.setAnnualPaymentAmount(renewal.getAnnualPaymentAmount()); if (ProjectStatusEnum.ACCEPTED.getCode().equals(project.getStatus())) { List annualAmounts = Lists.newArrayList(); annualAmounts.add(AnnualAmountVO.builder() @@ -149,10 +149,11 @@ public class ProjectRenewalFundManage { ProjectRenewalFundDeclaration oldDeclaration = projectRenewalFundDeclarationService.getById(dto.getId()); VUtils.isTrue(Objects.isNull(oldDeclaration)).throwMessage(String.format("重新申报失败 【%s】 该申报不存在!",dto.getId())); BeanUtils.copyProperties(oldDeclaration,declaration); + }else{ + declaration.setCreateOn(LocalDateTime.now()); + declaration.setUpdateOn(LocalDateTime.now()); } BeanUtils.copyProperties(dto,declaration); - declaration.setCreateOn(LocalDateTime.now()); - declaration.setUpdateOn(LocalDateTime.now()); declaration.setApprovalStatus(ProjectRenewalApprovalStatusEnum.PENDING.name()); declaration.setRegionCode(project.getAreaCode()); declaration.setOrgCode(project.getBuildOrgCode());