|
|
@@ -587,6 +587,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
* @param newEa
|
|
|
*/
|
|
|
private List<ExpenseAccountExamine> examineByprocess( ExpenseAccount newEa,AdminListBo admin) {
|
|
|
+ //在跳入董事长审核的时候非特批直接跳过,原则上下个流程不可再跳过
|
|
|
+ if (newEa.getProcessStatus()==EAProcessStatus.DSZSH.getCode()&&newEa.getApproval()!=1){
|
|
|
+ newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
+ }
|
|
|
//获取当前流程审核人,如果有已审核则跳过当前审核
|
|
|
List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
boolean flag=false;
|
|
|
@@ -602,7 +606,6 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
if (flag&&newEa.getProcessStatus()<6){
|
|
|
String str=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(newEa.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
@@ -613,11 +616,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
//在跳过的时候如果小于财务继续跳
|
|
|
- if (newEa.getProcessStatus()<EAProcessStatus.CWSH.getCode())examineByprocess(newEa,admin);
|
|
|
- //在跳入董事长审核的时候非特批直接跳过,原则上下个流程不可再跳过
|
|
|
- if (newEa.getProcessStatus()==EAProcessStatus.DSZSH.getCode()&&newEa.getApproval()!=1){
|
|
|
- newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
- }
|
|
|
+ if (newEa.getProcessStatus()<EAProcessStatus.CWFS.getCode())examineByprocess(newEa,admin);
|
|
|
list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
}
|
|
|
return list;
|