续建项目资金 详情返回增加

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

@@ -242,6 +242,11 @@ public class ProjectRenewalFundManage {
                                 .projectCode(project.getProjectCode())
                                 .projectYear(declaration.getProjectYear())
                                 .annualAmount(declaration.getAnnualPaymentAmount())
+                                .haveAmount(declaration.getHaveAmount())
+                                .govOwnFinanceAmount(declaration.getGovOwnFinanceAmount())
+                                .bankLendingAmount(declaration.getBankLendingAmount())
+                                .govSuperiorFinanceAmount(declaration.getGovSuperiorFinanceAmount())
+                                .otherAmount(declaration.getOtherAmount())
                                 .build());
                     })
             );
@@ -276,6 +281,11 @@ public class ProjectRenewalFundManage {
                                 .projectCode(baseinfo.getBaseProjId())
                                 .projectYear(declaration.getProjectYear())
                                 .annualAmount(declaration.getAnnualPaymentAmount())
+                                .haveAmount(declaration.getHaveAmount())
+                                .govOwnFinanceAmount(declaration.getGovOwnFinanceAmount())
+                                .bankLendingAmount(declaration.getBankLendingAmount())
+                                .govSuperiorFinanceAmount(declaration.getGovSuperiorFinanceAmount())
+                                .otherAmount(declaration.getOtherAmount())
                                 .build());
                     })
             );
@@ -310,6 +320,11 @@ public class ProjectRenewalFundManage {
                                 .projectCode(operationBaseinfo.getBaseProjId())
                                 .projectYear(declaration.getProjectYear())
                                 .annualAmount(declaration.getAnnualPaymentAmount())
+                                .haveAmount(declaration.getHaveAmount())
+                                .govOwnFinanceAmount(declaration.getGovOwnFinanceAmount())
+                                .bankLendingAmount(declaration.getBankLendingAmount())
+                                .govSuperiorFinanceAmount(declaration.getGovSuperiorFinanceAmount())
+                                .otherAmount(declaration.getOtherAmount())
                                 .build());
                     })
             );

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

@@ -32,4 +32,18 @@ public class AnnualAmountVO {
     @ApiModelProperty("年度投资资金")
     private BigDecimal annualAmount;
 
+    @ApiModelProperty("自有资金")
+    private BigDecimal haveAmount;
+
+    @ApiModelProperty("政府投资 本级财务金额")
+    private BigDecimal govOwnFinanceAmount;
+
+    @ApiModelProperty("政府投资 上级财务金额")
+    private BigDecimal govSuperiorFinanceAmount;
+
+    @ApiModelProperty("银行贷款金额")
+    private BigDecimal bankLendingAmount;
+
+    @ApiModelProperty("其它金额")
+    private BigDecimal otherAmount;
 }