Browse Source

审核日志列表修改,删除审核流程表

anderx 2 years ago
parent
commit
80bfe2983c

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

@@ -74,7 +74,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
         expenseAccountMapper.insertSelective(in);
         addExpenseAccountExamine(in.getId());
-        addExpenseAccountLogAndNoticEmail(in,0,"创建报销");
+        addExpenseAccountLog(in.getId(),0,in.getProcessStatus(),TokenManager.getAdminId(),"创建报销");
         return in.getId();
     }
 
@@ -167,18 +167,15 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     private void addExpenseAccountLogAndNoticEmail(InputExpenseAccount in, Integer status, String str) {
         String aid=TokenManager.getAdminId();
         addExpenseAccountLog(in.getId(),status,in.getProcessStatus(),aid,str);
-        //正常是走入上级审核,但是可能会跳过
-        if(status>0){
-            Admin admin = adminMapper.selectByPrimaryKey(aid);
-            if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
-                String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
-                Date date=new Date();
-                date.setTime(date.getTime()+1000L);
-                addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
-                in.setProcessStatus(in.getProcessStatus()+1);
-            }
-            createExamineByProcess(in);
+        Admin admin = adminMapper.selectByPrimaryKey(aid);
+        if (admin.getSuperiorId()==null||admin.getId().equals(admin.getSuperiorId())){
+            String str2=String.format("重复审核人跳过[%s]。",EAProcessStatus.getDesc(in.getProcessStatus()));
+            Date date=new Date();
+            date.setTime(date.getTime()+1000L);
+            addExpenseAccountLog(in.getId(),1,in.getProcessStatus(),aid,str2,date);
+            in.setProcessStatus(in.getProcessStatus()+1);
         }
+        createExamineByProcess(in);
     }
 
     private void createExamineByProcess(InputExpenseAccount in) {
@@ -229,7 +226,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             in.setTotalAmount(expenseAccountDetailsMapper.selectAmountCountByEAid(in.getId()));
         }
         if (useEA.getStatus()==0){
-            addExpenseAccountLogAndNoticEmail(in,1,"发起报销审核");
+            addExpenseAccountLogAndNoticEmail(in,0,"发起报销审核");
         }else if (useEA.getStatus()==3){
             addExpenseAccountLogAndNoticEmail(in,4,"修改并发起审核");
         }