|
@@ -277,8 +277,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
realAmount=realAmount.add(e.getRealAmount());
|
|
realAmount=realAmount.add(e.getRealAmount());
|
|
|
}
|
|
}
|
|
|
in.setTotalAmount(totalAmount);
|
|
in.setTotalAmount(totalAmount);
|
|
|
- in.setAmount(realAmount.subtract(useEA.getSettlementAmount()));
|
|
|
|
|
|
|
+ if (useEA==null||useEA.getSettlementAmount()==null){
|
|
|
|
|
+ in.setAmount(realAmount);
|
|
|
|
|
+ }else {
|
|
|
|
|
+ in.setAmount(realAmount.subtract(useEA.getSettlementAmount()));
|
|
|
|
|
+ }
|
|
|
in.setRealAmount(in.getAmount());
|
|
in.setRealAmount(in.getAmount());
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|