|
@@ -53,6 +53,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private JDBCIdGenerator idGenerator;
|
|
private JDBCIdGenerator idGenerator;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
private FinanceCountMapper financeCountMapper;
|
|
private FinanceCountMapper financeCountMapper;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ private ExpenseRelationshipMapper expenseRelationshipMapper;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@@ -60,14 +62,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public Integer add(InputExpenseAccount in) {
|
|
public Integer add(InputExpenseAccount in) {
|
|
|
- //设置付款部门和支付部门
|
|
|
|
|
- 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.getPrid()!=null){
|
|
if (in.getPrid()!=null){
|
|
|
PublicRelease pr = publicReleaseMapper.selectByPrimaryKey(in.getPrid());
|
|
PublicRelease pr = publicReleaseMapper.selectByPrimaryKey(in.getPrid());
|
|
@@ -77,8 +72,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
in.setUserNames(pr.getUserNames());
|
|
in.setUserNames(pr.getUserNames());
|
|
|
in.setDuration(pr.getDuration());
|
|
in.setDuration(pr.getDuration());
|
|
|
}
|
|
}
|
|
|
- Integer eaaid = expenseAccountPrivateMapper.selectByaidDefault(in.getAid());
|
|
|
|
|
- in.setEaaid(eaaid);
|
|
|
|
|
|
|
+
|
|
|
//判断报销类型,0=固定费用,1=报销到订单
|
|
//判断报销类型,0=固定费用,1=报销到订单
|
|
|
if (in.getOrderNo()==null){
|
|
if (in.getOrderNo()==null){
|
|
|
in.setTargetType(0);
|
|
in.setTargetType(0);
|
|
@@ -86,7 +80,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
in.setTargetType(1);
|
|
in.setTargetType(1);
|
|
|
}
|
|
}
|
|
|
expenseAccountMapper.insertSelective(in);
|
|
expenseAccountMapper.insertSelective(in);
|
|
|
- addExpenseAccountExamine(in.getId());
|
|
|
|
|
|
|
+
|
|
|
return in.getId();
|
|
return in.getId();
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -688,6 +682,40 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
return useEa;
|
|
return useEa;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ @Override
|
|
|
|
|
+ public Object merge(String ids) {
|
|
|
|
|
+ String[] split = ids.split(",");
|
|
|
|
|
+ List<String> list = Arrays.asList(split);
|
|
|
|
|
+ List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectByIds(list);
|
|
|
|
|
+ expenseAccounts.stream().forEach(e -> {
|
|
|
|
|
+ if (e.getStatus()!=0){
|
|
|
|
|
+ throw new BusinessException(String.format("[%s]编号已经发起,不能重复发起",e.getId()));
|
|
|
|
|
+ }
|
|
|
|
|
+ });
|
|
|
|
|
+ InputExpenseAccount in =new InputExpenseAccount();
|
|
|
|
|
+ //设置付款部门和支付部门
|
|
|
|
|
+ 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());
|
|
|
|
|
+ }
|
|
|
|
|
+ Integer eaaid = expenseAccountPrivateMapper.selectByaidDefault(in.getAid());
|
|
|
|
|
+ in.setEaaid(eaaid);
|
|
|
|
|
+ expenseAccountMapper.insertSelective(in);
|
|
|
|
|
+ expenseAccounts.stream().forEach(e -> {
|
|
|
|
|
+ ExpenseRelationship er=new ExpenseRelationship();
|
|
|
|
|
+ er.setId(in.getId());
|
|
|
|
|
+ er.setEaId(e.getId());
|
|
|
|
|
+ expenseRelationshipMapper.insert(er);
|
|
|
|
|
+ });
|
|
|
|
|
+ expenseAccountMapper.updateByIds(list,1);
|
|
|
|
|
+ addExpenseAccountExamine(in.getId());
|
|
|
|
|
+
|
|
|
|
|
+ return null;
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 计算当前报销显示抵扣金额
|
|
* 计算当前报销显示抵扣金额
|
|
|
* @param useEa
|
|
* @param useEa
|