|
@@ -498,13 +498,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
newEa.setStatus(status);
|
|
newEa.setStatus(status);
|
|
|
newEa.setExamineName("");
|
|
newEa.setExamineName("");
|
|
|
}else {
|
|
}else {
|
|
|
- //新的流程是当前流程+1
|
|
|
|
|
- newEa.setProcessStatus(useEa.getProcessStatus()+1);
|
|
|
|
|
- if (newEa.getApproval()==null)newEa.setApproval(useEa.getApproval());
|
|
|
|
|
//添加后续流程
|
|
//添加后续流程
|
|
|
if(newEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
|
|
if(newEa.getProcessStatus()==EAProcessStatus.CWSH.getCode()){
|
|
|
addExpenseAccountExamineFollow(in);
|
|
addExpenseAccountExamineFollow(in);
|
|
|
}
|
|
}
|
|
|
|
|
+ //新的流程是当前流程+1
|
|
|
|
|
+ newEa.setProcessStatus(useEa.getProcessStatus()+1);
|
|
|
|
|
+ if (newEa.getApproval()==null)newEa.setApproval(useEa.getApproval());
|
|
|
List<ExpenseAccountExamine> list=examineByprocess(newEa,admin);
|
|
List<ExpenseAccountExamine> list=examineByprocess(newEa,admin);
|
|
|
StringBuffer aname =new StringBuffer();
|
|
StringBuffer aname =new StringBuffer();
|
|
|
for (ExpenseAccountExamine e : list) {
|
|
for (ExpenseAccountExamine e : list) {
|
|
@@ -616,8 +616,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
addFinanceCount(admin.getDepFinance(),newEa.getCreateTime());
|
|
addFinanceCount(admin.getDepFinance(),newEa.getCreateTime());
|
|
|
}
|
|
}
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
- //在跳过的时候如果小于财务继续跳
|
|
|
|
|
- if (newEa.getProcessStatus()<EAProcessStatus.CWFS.getCode())examineByprocess(newEa,admin);
|
|
|
|
|
|
|
+ examineByprocess(newEa,admin);
|
|
|
list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
}
|
|
}
|
|
|
return list;
|
|
return list;
|
|
@@ -652,7 +651,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
list.add(notice);
|
|
list.add(notice);
|
|
|
EmailBo emailBo=new EmailBo(NoticeStatus.getValueByCode(noticeStatus),a.getEmail(),str);
|
|
EmailBo emailBo=new EmailBo(NoticeStatus.getValueByCode(noticeStatus),a.getEmail(),str);
|
|
|
asyncUtils.send(emailBo);
|
|
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);
|
|
asyncUtils.addNoticeBatch(list);
|
|
|
}
|
|
}
|