|
|
@@ -468,7 +468,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
String str=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(newEa.getProcessStatus()));
|
|
|
Date date=new Date();
|
|
|
date.setTime(date.getTime()+1000l);
|
|
|
- addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),TokenManager.getAdminId(),str,date);
|
|
|
+ List<ExpenseAccountExamine> expenseAccountExamineList = expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
|
|
|
+ String aid="";
|
|
|
+ for (ExpenseAccountExamine e : expenseAccountExamineList) {
|
|
|
+ if (e.getStatus()==1){
|
|
|
+ aid=e.getAuditor();
|
|
|
+ }
|
|
|
+ }
|
|
|
+ addExpenseAccountLog(newEa.getId(),1,newEa.getProcessStatus(),aid,str,date);
|
|
|
newEa.setProcessStatus(newEa.getProcessStatus()+1);
|
|
|
if (newEa.getProcessStatus()<EAProcessStatus.WCSH.getCode())examineByprocess(newEa);
|
|
|
}
|