Browse Source

报销撤销与重新发起,日志修改

anderx 2 years ago
parent
commit
6e7a44b64c

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

@@ -995,13 +995,13 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             expenseAccountMapper.updateByPrimaryKeySelective(update);
         }else if (in.getStatus()==4){
             expenseAccountMapper.updateByMainId(in.getId(),0);
+            addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
             List<ExpenseRelationship> list = expenseRelationshipMapper.selectById(in.getId());
             if (list.size()==1){
                 ExpenseRelationship e =list.get(0);
                 expenseAccountLogMapper.updateUseLogByUseId(e.getEaId(),e.getId());
             }else {
                 List<OutExpenseAccountLog> outExpenseAccountLogs = expenseAccountLogMapper.selectByEaid(in.getId());
-                addExpenseAccountLog(in.getId(),4,0,in.getAid(),"撤销报销审核");
                 for (int i=0;i<list.size();i++){
                     ExpenseRelationship e =list.get(0);
                     for (OutExpenseAccountLog eal : outExpenseAccountLogs) {
@@ -1009,9 +1009,9 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                     }
                     expenseAccountLogMapper.insertBatch(list);
                 }
-                expenseAccountLogMapper.deleteByeaid(in.getId());
-                expenseRelationshipMapper.deleteByPrimaryKey(in.getId());
             }
+            expenseAccountLogMapper.deleteByeaid(in.getId());
+            expenseRelationshipMapper.deleteByPrimaryKey(in.getId());
             expenseAccountMapper.deleteByPrimaryKey(in.getId());
         }
         return 1;