|
|
@@ -84,6 +84,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
in.setDistrictName(pr.getDistrictName());
|
|
|
in.setUserNames(pr.getUserNames());
|
|
|
in.setDuration(pr.getDuration());
|
|
|
+ if (in.getOrderNo()==null)in.setOrderNo(pr.getOrderNo());
|
|
|
}
|
|
|
//判断报销类型,0=固定费用,1=报销到订单
|
|
|
if (in.getOrderNo()==null){
|
|
|
@@ -908,6 +909,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
er.setId(in.getId());
|
|
|
er.setEaId(e.getId());
|
|
|
expenseRelationshipMapper.insertSelective(er);
|
|
|
+ expenseAccountLogMapper.updateUseLogByUseId(in.getId(),e.getId());
|
|
|
});
|
|
|
expenseAccountMapper.updateByIds(list,1);
|
|
|
return in.getId();
|
|
|
@@ -951,16 +953,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
|
|
|
addExpenseAccountExamine(in.getId(),update);
|
|
|
if (outExpenseAccount.getStatus()==0){
|
|
|
- //补旧日志
|
|
|
- MainExpenseAccount mianEA = expenseAccountMapper.selectByMainId(in.getId());
|
|
|
- List<Integer> collect = mianEA.getSonList().stream().map(SonExpenseAccount::getId).collect(Collectors.toList());
|
|
|
- if (!collect.isEmpty()){
|
|
|
- Integer i = expenseAccountMapper.selectDeleteIdBySonId(collect.get(0));
|
|
|
- if (i !=null)
|
|
|
- expenseAccountLogMapper.updateUseLogByUseId(in.getId(),i);
|
|
|
- expenseAccountLogMapper.deleteByeaid(i);
|
|
|
- expenseRelationshipMapper.deleteByPrimaryKey(i);
|
|
|
- }
|
|
|
+
|
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,outExpenseAccount.getStatus(),"发起报销审核");
|
|
|
}else if (outExpenseAccount.getStatus()==3){
|
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,4,"修改并发起审核");
|
|
|
@@ -972,7 +965,22 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
|
}else if (in.getStatus()==4){
|
|
|
expenseAccountMapper.updateByMainId(in.getId(),0);
|
|
|
- expenseAccountMapper.deleteByPrimaryKey(in.getId());
|
|
|
+ List<ExpenseRelationship> list = expenseRelationshipMapper.selectById(in.getId());
|
|
|
+ if (list.size()==1){
|
|
|
+ ExpenseRelationship e =list.get(0);
|
|
|
+ expenseAccountLogMapper.updateUseLogByUseId(e.getEaId(),e.getId());
|
|
|
+ }else {
|
|
|
+ List<OutExpenseAccountLog> outExpenseAccountLogs = expenseAccountLogMapper.selectByEaid(in.getId());
|
|
|
+ for (int i=0;i<list.size();i++){
|
|
|
+ ExpenseRelationship e =list.get(0);
|
|
|
+ for (OutExpenseAccountLog eal : outExpenseAccountLogs) {
|
|
|
+ eal.setEaid(e.getEaId());
|
|
|
+ }
|
|
|
+ expenseAccountLogMapper.insertBatch(list);
|
|
|
+ }
|
|
|
+ expenseAccountLogMapper.deleteByeaid(in.getId());
|
|
|
+ expenseRelationshipMapper.deleteByPrimaryKey(in.getId());
|
|
|
+ }
|
|
|
addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
|
|
|
}
|
|
|
return 1;
|