|
|
@@ -623,7 +623,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
list.add(notice);
|
|
|
EmailBo emailBo=new EmailBo(NoticeStatus.getValueByCode(noticeStatus),a.getEmail(),str);
|
|
|
asyncUtils.send(emailBo);
|
|
|
- weChatUtils.addExpenseAccountWeChatNotice(a.getExpenseOpenId(),status,in.getId(),date,aname,str);
|
|
|
+ try {
|
|
|
+ weChatUtils.addExpenseAccountWeChatNotice(a.getExpenseOpenId(),status,in.getId(),date,aname,str);
|
|
|
+ }catch (Exception e){
|
|
|
+ throw new BusinessException("网络通信异常,请稍后再试。");
|
|
|
+ }
|
|
|
}
|
|
|
asyncUtils.addNoticeBatch(list);
|
|
|
}
|
|
|
@@ -736,7 +740,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
List<ExpenseAccountExamine> expenseAccountExamines = expenseAccountExamineMapper.selectByEaidAndProcessStatus(id, res.getProcessStatus());
|
|
|
for (ExpenseAccountExamine e : expenseAccountExamines) {
|
|
|
if (e.getAuditor().equals(TokenManager.getAdminId())){
|
|
|
- res.setExamine(1);
|
|
|
+ if (res.getStatus()==1){
|
|
|
+ res.setExamine(1);
|
|
|
+ }
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -765,19 +771,30 @@ 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);
|
|
|
+ }
|
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,outExpenseAccount.getStatus(),"发起报销审核");
|
|
|
}else if (outExpenseAccount.getStatus()==3){
|
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,4,"修改并发起审核");
|
|
|
}
|
|
|
+ update.setStatus(in.getStatus());
|
|
|
+ update.setProcessStatus(outExpenseAccount.getProcessStatus());
|
|
|
+ update.setId(in.getId());
|
|
|
+ update.setExamineName(outExpenseAccount.getExamineName());
|
|
|
+ expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
|
}else if (in.getStatus()==4){
|
|
|
expenseAccountMapper.updateByMainId(in.getId(),0);
|
|
|
+ expenseAccountMapper.deleteByPrimaryKey(in.getId());
|
|
|
addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
|
|
|
}
|
|
|
- update.setStatus(in.getStatus());
|
|
|
- update.setProcessStatus(outExpenseAccount.getProcessStatus());
|
|
|
- update.setId(in.getId());
|
|
|
- update.setExamineName(outExpenseAccount.getExamineName());
|
|
|
- return expenseAccountMapper.updateByPrimaryKeySelective(update);
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
@Override
|