|
@@ -61,6 +61,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public Integer add(InputExpenseAccount in) {
|
|
public Integer add(InputExpenseAccount in) {
|
|
|
|
|
|
|
@@ -85,6 +86,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
return in.getId();
|
|
return in.getId();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 新增报销审核流程
|
|
* 新增报销审核流程
|
|
|
* @param id 报销编号
|
|
* @param id 报销编号
|
|
@@ -283,6 +286,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
for (ExpenseAccount e : list) {
|
|
for (ExpenseAccount e : list) {
|
|
|
if (!in.getId().equals(e.getId())){
|
|
if (!in.getId().equals(e.getId())){
|
|
|
count=count.add(e.getSettlementAmount());
|
|
count=count.add(e.getSettlementAmount());
|
|
|
|
|
+
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
newdebit.setSettlementAmount(count);
|
|
newdebit.setSettlementAmount(count);
|
|
@@ -693,31 +697,57 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
throw new BusinessException(String.format("[%s]编号已经发起,不能重复发起",e.getId()));
|
|
throw new BusinessException(String.format("[%s]编号已经发起,不能重复发起",e.getId()));
|
|
|
}
|
|
}
|
|
|
});
|
|
});
|
|
|
- InputExpenseAccount in =new InputExpenseAccount();
|
|
|
|
|
//设置付款部门和支付部门
|
|
//设置付款部门和支付部门
|
|
|
|
|
+ InputExpenseAccount in =new InputExpenseAccount();
|
|
|
in.setCheckNo(idGenerator.getNOgenerateId());
|
|
in.setCheckNo(idGenerator.getNOgenerateId());
|
|
|
- if (in.getAid()!=null){
|
|
|
|
|
- Admin admin = adminMapper.selectByPrimaryKey(in.getAid());
|
|
|
|
|
- in.setAname(admin.getName());
|
|
|
|
|
- in.setApplyDep(admin.getDepartmentId());
|
|
|
|
|
- in.setPayDep(admin.getDepartmentId());
|
|
|
|
|
|
|
+ if (in.getAid()==null){
|
|
|
|
|
+ in.setAid(TokenManager.getAdminId());
|
|
|
}
|
|
}
|
|
|
|
|
+ Admin admin = adminMapper.selectByPrimaryKey(in.getAid());
|
|
|
|
|
+ in.setAname(admin.getName());
|
|
|
|
|
+ in.setApplyDep(admin.getDepartmentId());
|
|
|
|
|
+ in.setPayDep(admin.getDepartmentId());
|
|
|
Integer eaaid = expenseAccountPrivateMapper.selectByaidDefault(TokenManager.getAdminId());
|
|
Integer eaaid = expenseAccountPrivateMapper.selectByaidDefault(TokenManager.getAdminId());
|
|
|
in.setEaaid(eaaid);
|
|
in.setEaaid(eaaid);
|
|
|
AtomicReference<BigDecimal> count = new AtomicReference<>(new BigDecimal(0));
|
|
AtomicReference<BigDecimal> count = new AtomicReference<>(new BigDecimal(0));
|
|
|
expenseAccounts.stream().forEach(e -> {
|
|
expenseAccounts.stream().forEach(e -> {
|
|
|
count.set(count.get().add(e.getTotalAmount()));
|
|
count.set(count.get().add(e.getTotalAmount()));
|
|
|
|
|
+ });
|
|
|
|
|
+ in.setTotalAmount(count.get());
|
|
|
|
|
+ expenseAccountMapper.insertSelective(in);
|
|
|
|
|
+ expenseAccounts.stream().forEach(e -> {
|
|
|
ExpenseRelationship er=new ExpenseRelationship();
|
|
ExpenseRelationship er=new ExpenseRelationship();
|
|
|
er.setId(in.getId());
|
|
er.setId(in.getId());
|
|
|
er.setEaId(e.getId());
|
|
er.setEaId(e.getId());
|
|
|
- expenseRelationshipMapper.insert(er);
|
|
|
|
|
|
|
+ expenseRelationshipMapper.insertSelective(er);
|
|
|
});
|
|
});
|
|
|
- in.setTotalAmount(count.get());
|
|
|
|
|
- expenseAccountMapper.insertSelective(in);
|
|
|
|
|
expenseAccountMapper.updateByIds(list,1);
|
|
expenseAccountMapper.updateByIds(list,1);
|
|
|
- addExpenseAccountExamine(in.getId());
|
|
|
|
|
|
|
+ return in.getId();
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- return 1;
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public MainExpenseAccount mainExpense(Integer id) {
|
|
|
|
|
+ MainExpenseAccount res = expenseAccountMapper.selectByMainId(id);
|
|
|
|
|
+ return res;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Object updateMain(MainExpenseAccount in) {
|
|
|
|
|
+ OutExpenseAccount outExpenseAccount = expenseAccountMapper.selectByid(in.getId());
|
|
|
|
|
+ if (outExpenseAccount != null&&outExpenseAccount.getStatus()!=0&&outExpenseAccount.getStatus()!=3) {
|
|
|
|
|
+ throw new BusinessException("主项目已发起,不可修改!");
|
|
|
|
|
+ }
|
|
|
|
|
+ ExpenseAccount update =new ExpenseAccount();
|
|
|
|
|
+ update.setId(in.getId());
|
|
|
|
|
+ if (in.getOrderNo()!=null)update.setOrderNo(in.getOrderNo());
|
|
|
|
|
+ if (in.getPayDep()!=null)update.setPayDep(in.getPayDep());
|
|
|
|
|
+ if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
|
|
|
|
|
+ if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
|
|
|
|
|
+ if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
|
|
|
|
|
+ update.setStatus(1);
|
|
|
|
|
+ update.setProcessStatus(1);
|
|
|
|
|
+ addExpenseAccountExamine(in.getId());
|
|
|
|
|
+ return expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|