Sfoglia il codice sorgente

报销审核列表BUG修复

anderx 2 anni fa
parent
commit
3c325ae4ff

+ 20 - 0
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseAccountServiceImpl.java

@@ -446,6 +446,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     @Override
     public Object logList(Integer eaid) {
         List<OutExpenseAccountLog> list = expenseAccountLogMapper.selectByEaid(eaid);
+        deduplication(list);
         if (!list.isEmpty()) {
             OutExpenseAccountLog lastout = list.get(list.size() - 1);
             ExpenseAccount expenseAccount = expenseAccountMapper.selectByPrimaryKey(eaid);
@@ -471,6 +472,25 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             return list;
     }
 
+    private void deduplication(List<OutExpenseAccountLog> list) {
+        List<OutExpenseAccountLog> newList=new ArrayList<>();
+        if (!list.isEmpty()){
+            for (OutExpenseAccountLog e : list) {
+                int count=0;
+                for (OutExpenseAccountLog e2 : list) {
+                    if (e.getAuditor().equals(e2.getAuditor())
+                            &&e.getStatus().equals(e2.getStatus())
+                            &&e.getCreateTime().getTime()==e2.getCreateTime().getTime()){
+                        count++;
+                    }
+                }
+                if (count==1)newList.add(e);
+            }
+            list.clear();
+            list.addAll(newList);
+        }
+    }
+
     private void addDetailsLog(List<OutExpenseAccountLog> list, ExpenseAccount expenseAccount,Integer useStatus) {
         OrganizationListOut dep = departmentMapper.selectAllById(expenseAccount.getApplyDep());
         List<ExpenseConfigDetails> configDetails = expenseConfigDetailsMapper.selectByDepId(expenseAccount.getApplyDep());