|
|
@@ -54,12 +54,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
@Override
|
|
|
public Integer add(InputExpenseAccount in) {
|
|
|
+ //设置付款部门和支付部门
|
|
|
if (in.getAid()!=null){
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(in.getAid());
|
|
|
in.setAname(admin.getName());
|
|
|
in.setApplyDep(admin.getDepartmentId());
|
|
|
in.setPayDep(admin.getDepartmentId());
|
|
|
}
|
|
|
+ //如果关联公出,获取公出信息
|
|
|
if (in.getPrid()!=null){
|
|
|
PublicRelease pr = publicReleaseMapper.selectByPrimaryKey(in.getPrid());
|
|
|
in.setReleaseStart(pr.getReleaseStart());
|
|
|
@@ -70,6 +72,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
Integer eaaid = expenseAccountPrivateMapper.selectByaidDefault(in.getAid());
|
|
|
in.setEaaid(eaaid);
|
|
|
+ //判断报销类型,0=固定费用,1=报销到订单
|
|
|
if (in.getOrderNo()==null){
|
|
|
in.setTargetType(0);
|
|
|
}else {
|
|
|
@@ -81,7 +84,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- * 添加审核流程
|
|
|
+ * 新增报销审核流程
|
|
|
* @param id
|
|
|
*/
|
|
|
private void addExpenseAccountExamine(Integer id) {
|
|
|
@@ -134,8 +137,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
|
|
|
}
|
|
|
-
|
|
|
- expenseAccountExamineMapper.insertBatch(list);
|
|
|
+ expenseAccountExamineMapper.insertBatch(list);
|
|
|
}
|
|
|
|
|
|
/**
|