|
@@ -287,8 +287,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private void pushResettingDebit(InputExpenseAccount in, Integer debitId) {
|
|
private void pushResettingDebit(InputExpenseAccount in, Integer debitId) {
|
|
|
ExpenseAccount debit = expenseAccountMapper.selectByPrimaryKey(debitId);
|
|
ExpenseAccount debit = expenseAccountMapper.selectByPrimaryKey(debitId);
|
|
|
List<ExpenseAccount> list = expenseAccountMapper.selectByDebitId(debitId);
|
|
List<ExpenseAccount> list = expenseAccountMapper.selectByDebitId(debitId);
|
|
|
- ExpenseAccount newdebit=new ExpenseAccount();
|
|
|
|
|
- newdebit.setId(debitId);
|
|
|
|
|
|
|
+ ExpenseAccount newDebit=new ExpenseAccount();
|
|
|
|
|
+ newDebit.setId(debitId);
|
|
|
//计算除开当前单,已选择抵扣金额
|
|
//计算除开当前单,已选择抵扣金额
|
|
|
BigDecimal count=new BigDecimal(0);
|
|
BigDecimal count=new BigDecimal(0);
|
|
|
for (ExpenseAccount e : list) {
|
|
for (ExpenseAccount e : list) {
|
|
@@ -297,15 +297,15 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- newdebit.setSettlementAmount(count);
|
|
|
|
|
|
|
+ newDebit.setSettlementAmount(count);
|
|
|
if (count.compareTo(new BigDecimal(0))==0){
|
|
if (count.compareTo(new BigDecimal(0))==0){
|
|
|
- newdebit.setLiquidationStatus(0);
|
|
|
|
|
|
|
+ newDebit.setLiquidationStatus(0);
|
|
|
}else if (count.compareTo(debit.getTotalAmount())<0){
|
|
}else if (count.compareTo(debit.getTotalAmount())<0){
|
|
|
- newdebit.setLiquidationStatus(1);
|
|
|
|
|
|
|
+ newDebit.setLiquidationStatus(1);
|
|
|
}else if (count.compareTo(debit.getTotalAmount())==0){
|
|
}else if (count.compareTo(debit.getTotalAmount())==0){
|
|
|
- newdebit.setLiquidationStatus(2);
|
|
|
|
|
|
|
+ newDebit.setLiquidationStatus(2);
|
|
|
}
|
|
}
|
|
|
- expenseAccountMapper.updateByPrimaryKeySelective(newdebit);
|
|
|
|
|
|
|
+ expenseAccountMapper.updateByPrimaryKeySelective(newDebit);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
|