Browse Source

多级同人BUG处理

anderx 2 years ago
parent
commit
635de87dab

+ 1 - 1
src/main/java/com/goafanti/common/mapper/ExpenseAccountMapper.xml

@@ -412,7 +412,7 @@
         a.user_names userNames,a.create_time, a.release_start,a.release_end, a.duration,b.name applyDepName,a.amount,
         c.name payDepName,d.name ,d.bank ,d.accounts ,a.settlement_amount settlementAmount,a.secondary_type secondaryType,
         a.liquidation_status liquidationStatus, a.remarks,a.check_no checkNo,a.secondary_type_other secondaryTypeOther,
-        a.create_time, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
+        a.create_time createTime, date_format(a.create_time,'%Y-%m-%d %H:%i:%S')createTimeStr,
         date_format(a.release_start,'%Y-%m-%d %H:%i:%S')releaseStartStr,
         date_format(a.release_end,'%Y-%m-%d %H:%i:%S')releaseEndStr
         FROM expense_account a left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id

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

@@ -556,13 +556,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
 
     }
 
-    private void pushExamineProcess( ExpenseAccount newEa,AdminListBo admin) {
-        //如果到了董事长审核,无需判断了
-        if (newEa.getProcessStatus()<EAProcessStatus.CWSH.getCode()){
-            //判断没一个流程是否可以跳过
-             examineByprocess(newEa,admin);
-        }
-    }
+
 
     /**
      * 审核流程推送,只要不是完成状态就继续判断是否跳过
@@ -595,6 +589,7 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
             }
             newEa.setProcessStatus(newEa.getProcessStatus()+1);
             if (newEa.getProcessStatus()<EAProcessStatus.CWSH.getCode())examineByprocess(newEa,admin);
+            list=expenseAccountExamineMapper.selectByEaidAndProcessStatus(newEa.getId(), newEa.getProcessStatus());
         }
         return list;
     }