|
|
@@ -456,9 +456,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
|
public Object mainExpenseExport(Integer id, HttpServletResponse response) {
|
|
|
MainExpenseAccount mainExpenseAccount = mainExpense(id);
|
|
|
- PDFUtils pdfUtils = new PDFUtils();
|
|
|
pushMainExpenseExport(mainExpenseAccount,response,uploadPath);
|
|
|
- return null;
|
|
|
+ return 1;
|
|
|
}
|
|
|
|
|
|
public void pushMainExpenseExport(MainExpenseAccount mainExpenseAccount,HttpServletResponse response, String uploadPath) {
|
|
|
@@ -539,6 +538,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
addCount(e,rows,index);
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
|
|
|
|
|
|
@@ -1591,30 +1591,30 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
if (in.getStatus()!=null)param.put("status",in.getStatus());
|
|
|
//如果前端未传 0自己 1审核的参数,默认自己,在审核列表的时候判断Aid,在
|
|
|
- if (in.getProcessStatus()==null||TokenManager.hasRole(AFTConstants.SALESMAN)) in.setProcessStatus(0);
|
|
|
- //如果是营销员,强制只能看自己的
|
|
|
- if(in.getProcessStatus()==0){
|
|
|
- in.setProcessStatus(0);
|
|
|
- }
|
|
|
- if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
+ if (TokenManager.hasRole(AFTConstants.SALESMAN)) in.setProcessStatus(0);
|
|
|
+ if(TokenManager.hasRole(AFTConstants.FINANCE_MANAGER)){
|
|
|
//财务经理查看权限
|
|
|
in.setProcessStatus(5);
|
|
|
+ param.put("auditor",TokenManager.getAdminId());
|
|
|
}else if(TokenManager.hasRole(AFTConstants.FINANCE_ADMIN)||TokenManager.hasRole(AFTConstants.SUPERADMIN)||
|
|
|
TokenManager.hasRole(AFTConstants.VICE_CEO)|| TokenManager.hasRole(AFTConstants.APPROVAL_DECISION)){
|
|
|
//财务管理员和超级管理员查看全部
|
|
|
in.setProcessStatus(6);
|
|
|
+ param.put("auditor",TokenManager.getAdminId());
|
|
|
}else if (TokenManager.hasRole(AFTConstants.FINANCE)){
|
|
|
//0 设置为财务查看
|
|
|
param.put("roleType",0);
|
|
|
+ param.put("auditor",TokenManager.getAdminId());
|
|
|
+ //如果是空设置为
|
|
|
+ if (in.getProcessStatus()==null)in.setProcessStatus(2);
|
|
|
}
|
|
|
if(in.getProcessStatus()==2||in.getProcessStatus()==1){
|
|
|
if (in.getAid()!=null){
|
|
|
param.put("aid",in.getAid());
|
|
|
}
|
|
|
param.put("auditor",TokenManager.getAdminId());
|
|
|
- }else {
|
|
|
- param.put("aid",TokenManager.getAdminId());
|
|
|
}
|
|
|
+
|
|
|
param.put("processStatus",in.getProcessStatus());
|
|
|
if (in.getExamineStatus()!=null){
|
|
|
param.put("examineStatus",in.getExamineStatus());
|