|
|
@@ -685,7 +685,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
examineByprocess(newEa,admin,dep,configDetailsList);
|
|
|
//推动到出纳如果设置无需则完成不设置下个人,否则就要设置
|
|
|
if (newEa.getProcessStatus()==EAProcessStatus.CNSH.getCode()){
|
|
|
- if(dep.getCashierExamine()==0){
|
|
|
+ if(dep.getCashierExamine()==1){
|
|
|
pushExamineName(newEa, aids);
|
|
|
}else {
|
|
|
//完成后的流程
|
|
|
@@ -859,8 +859,8 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
}
|
|
|
}
|
|
|
if (flag2){
|
|
|
+ if (str==null)str=String.format("未设置[%s]审核,跳过此流程",tip);
|
|
|
if (newEa.getProcessStatus()<EAProcessStatus.CNSH.getCode()){
|
|
|
- if (str==null)str=String.format("未设置[%s]审核,跳过此流程",tip);
|
|
|
addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
examineByprocess(newEa,admin,dep,list);
|