1

app/adminapi/lists/master_worker/EngineerSettlementPermanentlyLists.php

@@ -45,7 +45,11 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
 
     public function queryWhere(){
         $where = [];
-        /*if(isset($this->params['audit_state']) && $this->params['audit_state']!=''){
+        if(isset($this->params['settlement_time']) && empty($this->params['settlement_time'])){
+            $where[] = ['settlement_time', '=', ''];
+        }
+
+        /*if(isset($this->params['']) && $this->params['audit_state']!=''){
             $ids = MasterWorker::where('audit_state',$this->params['audit_state'])->column('id');
             $where[] = ['id', 'IN', $ids?:[0]];
             //dd($ids);
@@ -54,7 +58,7 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
         $bankWorkerIds = BankAccount::where('audit_state',0)->column('worker_id');
         $agreeWorkerIds = MasterWorkerAgree::where('audit_state',0)->column('worker_id');
         $ids = array_merge($infoWorkerIds,$bankWorkerIds,$agreeWorkerIds);*/
-        if(isset($this->params['real_name']) && !empty($this->params['real_name'])){
+        /*if(isset($this->params['real_name']) && !empty($this->params['real_name'])){
             $where[] = ['master_worker_id', 'IN', MasterWorker::where([['real_name', 'like', "%{$this->params['real_name']}%"]])->column('id')?:[0]];
         }
         if(isset($this->params['nickname']) && !empty($this->params['nickname'])){
@@ -62,7 +66,7 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
         }
         if(isset($this->params['account']) && !empty($this->params['account'])){
             $where[] = ['master_worker_id', 'IN', MasterWorker::where([['account', 'like', "%{$this->params['account']}%"]])->column('id')?:[0]];
-        }
+        }*/
         return $where;
     }
     /**
@@ -92,7 +96,7 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
      */
     public function lists(): array
     {
-        return EngineerSettlementPermanently::with(['bankAccount','workerInfo','salaryItemPermanently'])->where($this->searchWhere)
+        return EngineerSettlementPermanently::with(['bankAccount','workerInfo','salaryItemPermanently'])->where($this->searchWhere)->where($this->queryWhere())
             ->field(['*'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
@@ -109,7 +113,7 @@ class EngineerSettlementPermanentlyLists extends BaseAdminDataLists implements L
      */
     public function count(): int
     {
-        return EngineerSettlementPermanently::where($this->searchWhere)->count();
+        return EngineerSettlementPermanently::where($this->searchWhere)->where($this->queryWhere())->count();
     }
 
 }