|
|
@@ -748,14 +748,22 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
}else {
|
|
|
- addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
- newEa.setStatus(1);
|
|
|
//小于为固定单审核,大于可能被配置多人审核
|
|
|
if (useEa.getProcessStatus()<EAProcessStatus.CWFS.getCode()){
|
|
|
+ boolean flag=false;
|
|
|
+ List<ExpenseAccountExamine> list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), useEa.getProcessStatus());
|
|
|
+ for (ExpenseAccountExamine e : list) {
|
|
|
+ if (e.getAuditor().equals(TokenManager.getAdminId())){
|
|
|
+ flag=true;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if (!flag)throw new BusinessException("审核角色错误。请刷新页面");
|
|
|
newEa.setProcessStatus(useEa.getProcessStatus()+1);
|
|
|
}else {
|
|
|
newEa.setProcessStatus(useEa.getProcessStatus());
|
|
|
}
|
|
|
+ addExpenseAccountLog(in.getId(),status,useEa.getProcessStatus(),TokenManager.getAdminId(),in.getReason());
|
|
|
+ newEa.setStatus(1);
|
|
|
if (newEa.getApproval()==null)newEa.setApproval(useEa.getApproval());
|
|
|
//流程的推动
|
|
|
examineByprocess(newEa,admin,dep,configDetailsList);
|