|
|
@@ -498,20 +498,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
//添加后续流程
|
|
|
addExpenseAccountExamineFollow(in);
|
|
|
List<ExpenseAccountExamine> list=examineByprocess(newEa,admin);
|
|
|
- if(newEa.getProcessStatus()==4){
|
|
|
+ if(newEa.getProcessStatus()==8){
|
|
|
//完成后的流程
|
|
|
status =2;
|
|
|
-// Admin finaceAdmin = adminMapper.selectByPrimaryKey(admin.getDepFinance());
|
|
|
-// //同事添加通知财务管理员与公司副总
|
|
|
-// List<Admin> admins = adminMapper.selectAdminByRoleType(AFTConstants.FINANCE_ADMIN);
|
|
|
-// aids.addAll(admins);
|
|
|
-// List<Admin> viceCEO = adminMapper.selectAdminByRoleType(AFTConstants.VICE_CEO);
|
|
|
-// aids.addAll(viceCEO);
|
|
|
-// aids.add(finaceAdmin);
|
|
|
-// str.setLength(0);
|
|
|
-// str=str.append("报销编号[").append(in.getCheckNo()).append("]审核已通过,请注意查看。");
|
|
|
-// addNoticeAndEmail(in, status,str.toString(),admin.getName(),aids);
|
|
|
-// aids.clear();
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
newEa.setStatus(status);
|
|
|
newEa.setExamineName("");
|
|
|
@@ -527,8 +516,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
newEa.setExamineName(aname.substring(0,aname.length()-1));
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}else {
|
|
|
aids.add(adminMapper.selectByPrimaryKey(admin.getId()));
|
|
|
newEa.setStatus(3);
|
|
|
@@ -831,17 +818,20 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
//1-3s是不同人的审核
|
|
|
if (in.getProcessStatus()!=null&&in.getProcessStatus()==1){
|
|
|
- if (TokenManager.hasRole(AFTConstants.FINANCE)||TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
- in.setProcessStatus(3);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)||TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
- in.setProcessStatus(1);
|
|
|
- }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
|
|
|
+ if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
+ in.setProcessStatus(3);
|
|
|
+ }else if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
in.setProcessStatus(4);
|
|
|
- }else if(false){
|
|
|
- //先不做财务查看权限
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.SALESMAN_MANAGER)){
|
|
|
+ in.setProcessStatus(1);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.SALESMAN_ADMIN)){
|
|
|
+ in.setProcessStatus(2);
|
|
|
+ }else if (TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)||TokenManager.hasRole(AFTConstants.APPROVAL_DECISION_ASSISTANT)){
|
|
|
in.setProcessStatus(5);
|
|
|
- }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)){
|
|
|
- //财务管理员和超级管理员查看全部
|
|
|
+ }else if(TokenManager.hasRole(AFTConstants.VICE_CEO)){
|
|
|
+ //先不做财务查看权限
|
|
|
+ in.setProcessStatus(7);
|
|
|
+ }else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)){
|
|
|
in.setProcessStatus(6);
|
|
|
}
|
|
|
}else {
|