|
|
@@ -195,6 +195,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
private void addExpenseAccountLogAndNoticEmail(ExpenseAccount in, Integer status, String str) {
|
|
|
String aid=TokenManager.getAdminId();
|
|
|
addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
|
|
|
+ if (status==0)in.setProcessStatus(1);
|
|
|
Admin admin = adminMapper.selectByPrimaryKey(aid);
|
|
|
if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
|
|
|
in.setProcessStatus(in.getProcessStatus()+1);
|
|
|
@@ -360,10 +361,11 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
int maxProcessStatus=0;
|
|
|
if (!list.isEmpty()){
|
|
|
OutExpenseAccountLog lastout=list.get(list.size()-1);
|
|
|
- if (lastout.getStatus()!=3)maxProcessStatus=lastout.getProcessStatus();
|
|
|
+ if (lastout.getStatus()!=3){
|
|
|
+ List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
|
|
|
+ list.addAll(eaelist);
|
|
|
+ }
|
|
|
}
|
|
|
- List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
|
|
|
- list.addAll(eaelist);
|
|
|
return list;
|
|
|
}
|
|
|
|
|
|
@@ -770,10 +772,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (in.getApplyDep()!=null)update.setApplyDep(in.getApplyDep());
|
|
|
if (in.getRemarks()!=null)update.setRemarks(in.getRemarks());
|
|
|
if (in.getEaaid()!=null)update.setEaaid(in.getEaaid());
|
|
|
- outExpenseAccount.setProcessStatus(1);
|
|
|
addExpenseAccountExamine(in.getId(),update);
|
|
|
if (outExpenseAccount.getStatus()==0){
|
|
|
- addExpenseAccountLogAndNoticEmail(outExpenseAccount,0,"发起报销审核");
|
|
|
+ addExpenseAccountLogAndNoticEmail(outExpenseAccount,outExpenseAccount.getStatus(),"发起报销审核");
|
|
|
}else if (outExpenseAccount.getStatus()==3){
|
|
|
addExpenseAccountLogAndNoticEmail(outExpenseAccount,4,"修改并发起审核");
|
|
|
}
|