Browse Source

报销详情修改

anderx 1 year ago
parent
commit
7976002b6a

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

@@ -47,6 +47,15 @@ public class OutExpenseAccountBo {
 
     private String attachmentUrl;
     private Integer examine;
+    private Integer fullyAllocate;
+
+    public Integer getFullyAllocate() {
+        return fullyAllocate;
+    }
+
+    public void setFullyAllocate(Integer fullyAllocate) {
+        this.fullyAllocate = fullyAllocate;
+    }
 
     public String getOrderRemarks() {
         return orderRemarks;

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

@@ -1289,8 +1289,21 @@ public class ExpenseAccountServiceImpl extends BaseMybatisDao<ExpenseAccountMapp
                 "selectExpenseAccountTotalAmount", param, in.getPageNo(), in.getPageSize());
         List<OutExpenseAccountBo> list = (List<OutExpenseAccountBo>) pagePlus.getList();
         for (OutExpenseAccountBo e : list) {
+            //设定是否需要审核
             e.setExamine(pushExpenseAccountGetExamine(e.getId(), e.getProcessStatus()));
-
+            //设定是否完成订单匹配
+            List<ExpenseAccount> expenseAccounts = expenseAccountMapper.selectListByMainId(e.getId());
+            int count = 0;
+            for (ExpenseAccount e2 : expenseAccounts) {
+                if(e2.getOrderNo()!=null){
+                    count++;
+                }
+            }
+            if (count==expenseAccounts.size()){
+                e.setFullyAllocate(1);
+            }else {
+                e.setFullyAllocate(0);
+            }
         }
         return pagePlus;
     }