Просмотр исходного кода

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

anderx лет назад: 2
Родитель
Сommit
fd72cb3d86

+ 1 - 2
src/main/java/com/goafanti/common/dao/ExpenseAccountLogMapper.java

@@ -1,7 +1,6 @@
 package com.goafanti.common.dao;
 
 import com.goafanti.common.model.ExpenseAccountLog;
-import com.goafanti.expenseAccount.bo.ExpenseAccountExamineLog;
 import com.goafanti.expenseAccount.bo.OutExpenseAccountLog;
 
 import java.util.List;
@@ -21,5 +20,5 @@ public interface ExpenseAccountLogMapper {
 
     List<OutExpenseAccountLog> selectByEaid(Integer eaid);
 
-    ExpenseAccountExamineLog selectExamineLog(Integer eaid);
+
 }

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

@@ -116,15 +116,5 @@
     where a.eaid= #{eaid}
     order by a.create_time
   </select>
-  <select id="selectExamineLog" resultType="com.goafanti.expenseAccount.bo.ExpenseAccountExamineLog">
-    select a.id,a.status ,a.process_status processStatus ,b.name yxy ,c.name yxjl,yxgly.name yxgly,e.name cwzy,zc.name boss
-    from expense_account a left join admin b on a.aid=b.id left join admin c on b.superior_id =c.id
-    left join department d on b.department_id =d.id left join admin e on d.finance_id =e.id
-    left join (select a.department_id depId,group_concat(a.name) name from admin a left join user_role b
-        on a.id=b.uid left join `role` c on b.rid =c.id where c.role_type ='9996' and a.status ='0' group by a.department_id )yxgly
-    on b.department_id =yxgly.depId
-    left join (select group_concat(a.name) name from admin a left join user_role b on a.id=b.uid left join `role` c
-        on b.rid =c.id where c.role_type in ('99998','99988','99999','99989') and a.status ='0' ) zc on 1=1
-    where a.id= #{eaid}
-  </select>
+
 </mapper>

+ 0 - 11
src/main/java/com/goafanti/expenseAccount/controller/ExpenseAccountController.java

@@ -154,17 +154,6 @@ public class ExpenseAccountController extends CertifyApiController {
         return res;
     }
 
-    @RequestMapping(value = "/examineLog",method = RequestMethod.GET)
-    public Result examineLog(Integer eaid){
-        Result res =new Result();
-        if (eaid==null){
-            res.getError().add(buildErrorMessageParams(ErrorConstants.PARAM_EMPTY_ERROR,"报销编号"));
-            return res;
-        }
-        res.setData(expenseAccountService.examineLog(eaid));
-        return res;
-    }
-
 
     /**
      * 报销审核

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

@@ -311,21 +311,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     @Override
     public Object logList(Integer 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.addAll(eaelist);
         return list;
     }
 
-    @Override
-    public ExpenseAccountExamineLog examineLog(Integer eaid) {
-        return expenseAccountLogMapper.selectExamineLog(eaid);
-    }
+
 
     @Override
     public int updateExamine(InputExpenseAccount in) {