Browse Source

报销详情抵扣显示BUG修复

anderx 2 years ago
parent
commit
3c0c68404e

+ 8 - 0
src/main/java/com/goafanti/expenseAccount/bo/OutExpenseAccountBo.java

@@ -22,7 +22,15 @@ public class OutExpenseAccountBo {
     private String depName;
     private String financeName;
     private String attachmentUrl;
+    private Integer examine;
 
+    public Integer getExamine() {
+        return examine;
+    }
+
+    public void setExamine(Integer examine) {
+        this.examine = examine;
+    }
 
     public String getTypeOther() {
         return typeOther;

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

@@ -11,6 +11,7 @@ import com.goafanti.common.error.BusinessException;
 import com.goafanti.common.model.*;
 import com.goafanti.common.utils.*;
 import com.goafanti.core.mybatis.BaseMybatisDao;
+import com.goafanti.core.mybatis.page.Pagination;
 import com.goafanti.core.shiro.token.TokenManager;
 import com.goafanti.expenseAccount.Enums.EAProcessStatus;
 import com.goafanti.expenseAccount.bo.*;
@@ -522,9 +523,14 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
     public Object pageList(InputPageListBo in) {
         Map<String ,Object> param=new HashMap<>();
         addParam(in, param);
-        return findPagePlus("selectExpenseAccountList",
+        Pagination<?> pagePlus = findPagePlus("selectExpenseAccountList",
                 "selectExpenseAccountCount",
                 "selectExpenseAccountTotalAmount", param, in.getPageNo(), in.getPageSize());
+        List<OutExpenseAccountBo> list = (List<OutExpenseAccountBo>) pagePlus.getList();
+        for (OutExpenseAccountBo e : list) {
+            e.setExamine(pushExpenseAccountGetExamine(e.getId(), e.getProcessStatus()));
+        }
+        return pagePlus;
     }
 
     @Override
@@ -587,6 +593,28 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
         }
     }
 
+    /**
+     * 判断角色是否已经审核
+     * @param
+     */
+    private Integer pushExpenseAccountGetExamine(Integer id,Integer processStatus) {
+        List<ExpenseAccountExamine> list = expenseAccountExamineMapper.selectByEaidAndProcessStatus(id, processStatus);
+        boolean flag=false;
+        for (ExpenseAccountExamine e : list) {
+            if (e.getAuditor().equals(TokenManager.getAdminId())){
+                if (e.getStatus()==0){
+                    flag=true;
+                    break;
+                }
+            }
+        }
+        if (flag){
+            return 1;
+        }else {
+            return 0;
+        }
+    }
+
     @Override
     public Object updateType(InputExpenseAccount in) {
         expenseAccountDetailsMapper.deleteByeaid(in.getId());