|
|
@@ -501,15 +501,16 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
if (processStatus <3){
|
|
|
List<OutExpenseAccountLog> outExpenseAccountLogs = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, processStatus);
|
|
|
list.addAll(outExpenseAccountLogs);
|
|
|
- }
|
|
|
- List<ExpenseAccountExamine> expenseAccountExamines = expenseAccountExamineMapper.selectByEaidAndProcessStatus(eaid, processStatus);
|
|
|
- for (ExpenseAccountExamine e : expenseAccountExamines) {
|
|
|
- if (e.getStatus()==0){
|
|
|
- OutExpenseAccountLog out =new OutExpenseAccountLog();
|
|
|
- out.setEaid(eaid);
|
|
|
- out.setProcessStatus(e.getProcessStatus());
|
|
|
- out.setAuditorName(e.getAuditorname());
|
|
|
- list.add(out);
|
|
|
+ }else {
|
|
|
+ List<ExpenseAccountExamine> expenseAccountExamines = expenseAccountExamineMapper.selectByEaidAndProcessStatus(eaid, processStatus);
|
|
|
+ for (ExpenseAccountExamine e : expenseAccountExamines) {
|
|
|
+ if (e.getStatus()==0){
|
|
|
+ OutExpenseAccountLog out =new OutExpenseAccountLog();
|
|
|
+ out.setEaid(eaid);
|
|
|
+ out.setProcessStatus(e.getProcessStatus());
|
|
|
+ out.setAuditorName(e.getAuditorname());
|
|
|
+ list.add(out);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
if (processStatus<8)addDetailsLog(list, expenseAccount,processStatus);
|