diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java index 8a45a17..363ab06 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/workbench/model/vo/WorkbenchVO.java @@ -92,6 +92,10 @@ public class WorkbenchVO implements Serializable { private BigDecimal approvalAmountGrowthRate; public BigDecimal getDeclaredAmountGrowthRate(){ + if(Objects.isNull(declaredAmount)){ + this.declaredAmount = BigDecimal.ZERO; + } + // if((Objects.nonNull(declaredAmount)&&declaredAmount.compareTo(BigDecimal.ZERO) > 0) && (Objects.isNull(declaredAmountLastYear) || // declaredAmountLastYear.compareTo(BigDecimal.ZERO) == 0)){ // return BigDecimal.valueOf(100); @@ -106,6 +110,9 @@ public class WorkbenchVO implements Serializable { } public BigDecimal getApprovalAmountGrowthRate(){ + if(Objects.isNull(approvalAmount)){ + this.approvalAmount = BigDecimal.ZERO; + } // if((Objects.nonNull(approvalAmount)&&approvalAmount.compareTo(BigDecimal.ZERO) > 0) && (Objects.isNull(approvalAmountLastYear) || // approvalAmountLastYear.compareTo(BigDecimal.ZERO) == 0)){ // return BigDecimal.valueOf(100);