diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java index 5bf8d96..d9018aa 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java @@ -121,6 +121,7 @@ public class AnnualPlanLibManage { item.setDeclaredAmount(w.getDeclareAmount()); item.setBuildOrg(w.getBuildOrgName()); item.setCreateOn(w.getCreateOn()); + item.setApprovalAmount(w.getApprovalAmount()); item.setIsStartDeclaredProject(!IN_THE_ANNUAL_PLAN.eq(w.getStatus())); result.getRecords().add(item); }); diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java index a70b985..867c098 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java @@ -29,6 +29,9 @@ public class AnnualPlanListItemVO { @ApiModelProperty("申报金额") private BigDecimal declaredAmount; + @ApiModelProperty("立项批复金额") + private BigDecimal approvalAmount; + @ApiModelProperty("预算年度") private Integer projectYear;