Browse Source

年度计划库增加立项批复金额

tags/24080901
WendyYang 1 year ago
parent
commit
627833d14d
2 changed files with 4 additions and 0 deletions
  1. +1
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java
  2. +3
    -0
      pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java

+ 1
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/manage/AnnualPlanLibManage.java View File

@@ -121,6 +121,7 @@ public class AnnualPlanLibManage {
item.setDeclaredAmount(w.getDeclareAmount()); item.setDeclaredAmount(w.getDeclareAmount());
item.setBuildOrg(w.getBuildOrgName()); item.setBuildOrg(w.getBuildOrgName());
item.setCreateOn(w.getCreateOn()); item.setCreateOn(w.getCreateOn());
item.setApprovalAmount(w.getApprovalAmount());
item.setIsStartDeclaredProject(!IN_THE_ANNUAL_PLAN.eq(w.getStatus())); item.setIsStartDeclaredProject(!IN_THE_ANNUAL_PLAN.eq(w.getStatus()));
result.getRecords().add(item); result.getRecords().add(item);
}); });


+ 3
- 0
pmapi/src/main/java/com/ningdatech/pmapi/projectlib/model/vo/AnnualPlanListItemVO.java View File

@@ -29,6 +29,9 @@ public class AnnualPlanListItemVO {
@ApiModelProperty("申报金额") @ApiModelProperty("申报金额")
private BigDecimal declaredAmount; private BigDecimal declaredAmount;


@ApiModelProperty("立项批复金额")
private BigDecimal approvalAmount;

@ApiModelProperty("预算年度") @ApiModelProperty("预算年度")
private Integer projectYear; private Integer projectYear;




Loading…
Cancel
Save