Browse Source

报销列表合同编号搜索修改

anderx 1 year ago
parent
commit
f0d63f8676

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

@@ -477,8 +477,10 @@
       left join admin d2 on b.expense_finance_id =d2.id
     </if>
     <if test="expenseMain ==1">
+      left join expense_relationship er on a.id=er.id
+      left join expense_account sea on  er.ea_id=sea.id
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
-      left join t_order_new e on a.order_no =e.order_no
+      left join t_order_new e on sea.order_no =e.order_no
       left join admin d2 on b.expense_finance_id =d2.id
     </if>
     left join t_order_mid  tm on e.order_no =tm.order_no
@@ -588,7 +590,11 @@
       left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
     </if>
     <if test="expenseMain ==1">
+      left join expense_relationship er on a.id=er.id
+      left join expense_account sea on  er.ea_id=sea.id
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+      left join t_order_new e on sea.order_no =e.order_no
+      left join admin d2 on b.expense_finance_id =d2.id
     </if>
     <if test="processStatus ==1">
       inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine
@@ -614,8 +620,11 @@
       left join department b on mea.apply_dep =b.id left join department c on mea.pay_dep =c.id
     </if>
     <if test="expenseMain ==1">
-      left join t_order_new e on a.order_no =e.order_no
+      left join expense_relationship er on a.id=er.id
+      left join expense_account sea on  er.ea_id=sea.id
       left join department b on a.apply_dep =b.id left join department c on a.pay_dep =c.id
+      left join t_order_new e on sea.order_no =e.order_no
+      left join admin d2 on b.expense_finance_id =d2.id
     </if>
     <if test="processStatus ==1">
       inner join (select eaid ,auditor,min(process_status)`type` from expense_account_examine

+ 4 - 1
src/main/java/com/goafanti/expenseAccount/service/impl/ExpenseCountsServiceImpl.java

@@ -2,10 +2,13 @@ package com.goafanti.expenseAccount.service.impl;
 
 import com.goafanti.common.dao.ExpenseAccountMapper;
 import com.goafanti.common.dao.TOrderNewMapper;
+import com.goafanti.expenseAccount.bo.ExpenseCountsBo;
 import com.goafanti.expenseAccount.service.ExpenseCountsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class ExpenseCountsServiceImpl implements ExpenseCountsService {
 
@@ -16,7 +19,7 @@ public class ExpenseCountsServiceImpl implements ExpenseCountsService {
     @Override
     public Object getCounts() {
         //获取订单基本信息
-        tOrderNewMapper.selectExpenseCount();
+        List<ExpenseCountsBo> expenseCountsBos = tOrderNewMapper.selectExpenseCount();
         //获取订单报销多人
         return null;
     }