|
|
@@ -579,12 +579,12 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (e.getBx()==1){
|
|
|
if (e.getDebitId()!=null){
|
|
|
e.setDk(1);
|
|
|
- e.setDkAmount(e.getBxAmout());
|
|
|
+ e.setDkAmount(e.getBxAmount());
|
|
|
}
|
|
|
if (e.getTargetType()==0){
|
|
|
- e.setGdfyAmount(e.getBxAmout());
|
|
|
+ e.setGdfyAmount(e.getBxAmount());
|
|
|
}else if (e.getTargetType()==1){
|
|
|
- e.setBxddAmount(e.getBxAmout());
|
|
|
+ e.setBxddAmount(e.getBxAmount());
|
|
|
}
|
|
|
}
|
|
|
//如果不存在就新增
|
|
|
@@ -607,7 +607,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (e.getBx()!=null)out.setBx(out.getBx()+e.getBx());
|
|
|
if (e.getJz()!=null)out.setJz(out.getJz()+e.getJz());
|
|
|
if (e.getDk()!=null)out.setDk(out.getDk()+e.getDk());
|
|
|
- if (e.getBxAmout()!=null)out.setBxAmout(out.getBxAmout().add(e.getBxAmout()));
|
|
|
+ if (e.getBxAmount()!=null)out.setBxAmount(out.getBxAmount().add(e.getBxAmount()));
|
|
|
if (e.getJzAmount()!=null)out.setJzAmount(out.getJzAmount().add(e.getJzAmount()));
|
|
|
if (e.getDkAmount()!=null)out.setDkAmount(out.getDkAmount().add(e.getDkAmount()));
|
|
|
if (e.getGdfyAmount()!=null)out.setGdfyAmount(out.getGdfyAmount().add(e.getGdfyAmount()));
|
|
|
@@ -616,7 +616,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (e.getBhs()!=null)out.setBhs(out.getBhs()+e.getBhs());
|
|
|
}
|
|
|
BigDecimal totalAmount=new BigDecimal(0);
|
|
|
- totalAmount=totalAmount.add(out.getBxAmout()).add(out.getJzAmount()).subtract(out.getDkAmount());
|
|
|
+ totalAmount=totalAmount.add(out.getBxAmount()).add(out.getJzAmount()).subtract(out.getDkAmount());
|
|
|
out.setTotalAmount(totalAmount);
|
|
|
results.add(out);
|
|
|
}
|