|
|
@@ -618,7 +618,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
boolean flag2= false;
|
|
|
Date date2=new Date();
|
|
|
date2.setTime(date2.getTime()+1000l);
|
|
|
- String tip="";
|
|
|
+ String tip=null;
|
|
|
if (newEa.getProcessStatus()==EAProcessStatus.CWFS.getCode()){
|
|
|
//财务复审财务复审
|
|
|
if (dep.getExpenseRetrialFinanceExamine()==0){
|
|
|
@@ -628,7 +628,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWFS.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag2=true;
|
|
|
- str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWGGLYSH.getDesc());
|
|
|
+ str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWFS.getDesc());
|
|
|
}
|
|
|
}
|
|
|
}else if (newEa.getProcessStatus()==EAProcessStatus.DSZSH.getCode()){
|
|
|
@@ -637,10 +637,10 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
flag2=true;
|
|
|
tip="特批(财务选择)";
|
|
|
}else {
|
|
|
- boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWFS.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.DSZSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag2=true;
|
|
|
- str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWGGLYSH.getDesc());
|
|
|
+ str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.DSZSH.getDesc());
|
|
|
}
|
|
|
}
|
|
|
}else {
|
|
|
@@ -653,7 +653,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
flag2=true;
|
|
|
tip=EAProcessStatus.CWGGLYSH.getDesc();
|
|
|
}else {
|
|
|
- boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWFS.getCode());
|
|
|
+ boolean expenseExamine = pushExpenseExamine(list, newEa, examineList, EAProcessStatus.CWGGLYSH.getCode());
|
|
|
if (expenseExamine){
|
|
|
flag2=true;
|
|
|
str=String.format("[%s]通过审核,步入下个流程",EAProcessStatus.CWGGLYSH.getDesc());
|
|
|
@@ -683,12 +683,13 @@ 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(),"1",str,date2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
examineByprocess(newEa,admin,dep,list);
|
|
|
}else {
|
|
|
+ addExpenseAccountLog(newEa.getId(),2,newEa.getProcessStatus(),"1",str,date2);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus());
|
|
|
newEa.setStatus(2);
|
|
|
}
|