Commit 1b068d4c authored by zhkwei's avatar zhkwei

1、TBM公式

parent 6c293162
...@@ -106,7 +106,7 @@ public class TBM extends FunctionBase implements FreeRefFunction { ...@@ -106,7 +106,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1))); dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
} }
} }
amount = amount.add(dto.getAmount()); amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
dto.setPeriod(period); dto.setPeriod(period);
dto.setIsOnlyManualInput(Boolean.FALSE); dto.setIsOnlyManualInput(Boolean.FALSE);
dto.setName(Constant.DataSourceName.ReportDataSource); dto.setName(Constant.DataSourceName.ReportDataSource);
...@@ -182,7 +182,7 @@ public class TBM extends FunctionBase implements FreeRefFunction { ...@@ -182,7 +182,7 @@ public class TBM extends FunctionBase implements FreeRefFunction {
dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1))); dto.setAmount(balance.getEndBalBeq().multiply(new BigDecimal(-1)));
} }
} }
amount = amount.add(dto.getAmount()); amount = amount.add(dto.getAmount()==null?(new BigDecimal(0)):dto.getAmount());
dto.setPeriod(period); dto.setPeriod(period);
dto.setIsOnlyManualInput(Boolean.FALSE); dto.setIsOnlyManualInput(Boolean.FALSE);
dto.setName(Constant.DataSourceName.ReportDataSource); dto.setName(Constant.DataSourceName.ReportDataSource);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment