up -

app/adminapi/lists/master_worker/EngineerSettlementPermanentlyLists.php

@@ -46,7 +46,7 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
     public function queryWhere(){
         $where = [];
         if(isset($this->params['settlement_time']) && empty($this->params['settlement_time'])){
-            $where[] = ['settlement_time', '=', ''];
+            //$where[] = ['settlement_time', '=', ''];
         }
 
         /*if(isset($this->params['']) && $this->params['audit_state']!=''){
@@ -96,12 +96,16 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
      */
     public function lists(): array
     {
-        return EngineerSettlementPermanently::with(['bankAccount','workerInfo','salaryItemPermanently'])->where($this->searchWhere)->where($this->queryWhere())
+        $list =  EngineerSettlementPermanently::with(['bankAccount','workerInfo','salaryItemPermanently'])->where($this->searchWhere)->where($this->queryWhere())
             ->field(['*'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
             ->toArray();
+        foreach ($list as &$item) {
+            $item['all_salary'] = $this->getAllSalary($item['salaryItemPermanently']);
+        }
+        return $list;
     }
 
 
@@ -116,4 +120,14 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
         return EngineerSettlementPermanently::where($this->searchWhere)->where($this->queryWhere())->count();
     }
 
+    public function getAllSalary($salaryItemPermanently): float
+    {
+        $all_salary = 0.00;
+        foreach ($salaryItemPermanently as $item) {
+            $all_salary += $item['term_amount'];
+        }
+        return $all_salary;
+    }
+
+
 }