Bladeren bron

Merge branch 'bug_wf_20230202' of wugg/cxinv into master-dev

wufeng 2 jaren geleden
bovenliggende
commit
aeecdf8398
1 gewijzigde bestanden met toevoegingen van 10 en 1 verwijderingen
  1. 10 1
      app/admin/controller/Payment.php

+ 10 - 1
app/admin/controller/Payment.php

@@ -1419,8 +1419,17 @@ class Payment extends BaseController
                 ->leftJoin("pay b", "a.payNo=b.payNo")
                 ->where($condition)
                 ->sum('a.inv_subtotal_amount'), 2);
+
+            $sub_sql = Db::name("pay_invoice")
+                ->alias("a")
+                ->field('hpNo')
+                ->leftJoin("pay b", "a.payNo=b.payNo")
+                ->where($condition)
+                ->buildSql();
+
             $total = round(Db::name("invoice_info")
-                ->where(["hpNo" => array_column($list, 'hpNo'), "status" => 1])
+                ->where(["status" => 1])
+                ->where('hpNo in ' . $sub_sql)
                 ->sum('total'), 2);
         }