|
|
@@ -619,9 +619,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public List<OutExpenseAccount> selectDebitOrder(String depId) {
|
|
|
+ public List<OutExpenseAccount> selectDebitOrder(String depId,Integer id) {
|
|
|
String aid= TokenManager.getAdminId();
|
|
|
- return expenseAccountMapper.selectByaidAndType(aid,depId,4);
|
|
|
+ List<OutExpenseAccount> list = expenseAccountMapper.selectByaidAndType(aid, depId, 4);
|
|
|
+ for (OutExpenseAccount e : list) {
|
|
|
+ BigDecimal count=new BigDecimal(0);
|
|
|
+ List<ExpenseAccount> list1 = expenseAccountMapper.selectByDebitId(e.getId());
|
|
|
+ for (ExpenseAccount e1 : list1) {
|
|
|
+ if (e1.getId()!=id){
|
|
|
+ count=count.add(e1.getSettlementAmount());
|
|
|
+ }
|
|
|
+ }
|
|
|
+ e.setSettlementAmount(count);
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
|