|
|
@@ -263,8 +263,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
}
|
|
|
if (in.getSettlementAmount()==null)in.setSettlementAmount(useEA.getSettlementAmount());
|
|
|
- in.setAmount(in.getRealAmount().subtract(in.getSettlementAmount()));
|
|
|
- in.setRealAmount(in.getAmount());
|
|
|
in.setStatus(0);
|
|
|
return expenseAccountMapper.updateByPrimaryKeySelective(in);
|
|
|
}
|
|
|
@@ -279,8 +277,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
realAmount=realAmount.add(e.getRealAmount());
|
|
|
}
|
|
|
in.setTotalAmount(totalAmount);
|
|
|
- in.setRealAmount(realAmount);
|
|
|
- in.setAmount(realAmount.subtract(useEA.getSettlementAmount()));
|
|
|
+ in.setAmount(in.getRealAmount().subtract(useEA.getSettlementAmount()));
|
|
|
+ in.setRealAmount(in.getAmount());
|
|
|
}
|
|
|
|
|
|
@Override
|