|
@@ -311,21 +311,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
|
|
|
@Override
|
|
@Override
|
|
|
public Object logList(Integer eaid) {
|
|
public Object logList(Integer eaid) {
|
|
|
List<OutExpenseAccountLog> list = expenseAccountLogMapper.selectByEaid(eaid);
|
|
List<OutExpenseAccountLog> list = expenseAccountLogMapper.selectByEaid(eaid);
|
|
|
- int maxProcessStatus=0;
|
|
|
|
|
- for (OutExpenseAccountLog e : list) {
|
|
|
|
|
- if (e.getProcessStatus()>maxProcessStatus){
|
|
|
|
|
- maxProcessStatus=e.getProcessStatus();
|
|
|
|
|
- }
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ int maxProcessStatus=list.get(list.size()-1).getProcessStatus();
|
|
|
|
|
+
|
|
|
List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
|
|
List<OutExpenseAccountLog> eaelist = expenseAccountExamineMapper.selectNotExamineByEaidAndProcessStatus(eaid, maxProcessStatus);
|
|
|
list.addAll(eaelist);
|
|
list.addAll(eaelist);
|
|
|
return list;
|
|
return list;
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- @Override
|
|
|
|
|
- public ExpenseAccountExamineLog examineLog(Integer eaid) {
|
|
|
|
|
- return expenseAccountLogMapper.selectExamineLog(eaid);
|
|
|
|
|
- }
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
public int updateExamine(InputExpenseAccount in) {
|
|
public int updateExamine(InputExpenseAccount in) {
|