up

app/adminapi/lists/master_worker/EngineerSettlementLists.php

@@ -38,12 +38,24 @@ class EngineerSettlementLists extends BaseAdminDataLists implements ListsSearchI
     public function setSearch(): array
     {
         return [
-            '=' => ['batch_number','master_worker_id', 'worker_number', 'engineer_name', 'original_balance', 'total_settlement_amount', 'deduction_amount', 'final_settlement_amount', 'settlement_time', 'settlement_details_remarks'],
+            '=' => ['batch_number','master_worker_id', 'worker_number', 'engineer_name', 'original_balance', 'total_settlement_amount', 'deduction_amount', 'final_settlement_amount',  'settlement_details_remarks'],
 
         ];
     }
 
-
+    public function queryWhere()
+    {
+        $where = [];
+        if(isset($this->params['settlement_time']) && $this->params['settlement_time']){
+            $where[] = ['settlement_time','=',date('Y-m-d H:i:s',strtotime($this->params['settlement_time']))];
+        }
+        if(isset($this->params['create_time']) && $this->params['create_time']){
+            $startDateTime = strtotime($this->params['create_time']);
+            $endDateTime = strtotime('+1 day', $startDateTime)-1;
+            $where[] = ['create_time','BETWEEN',[$startDateTime,$endDateTime]];
+        }
+        return $where;
+    }
     /**
      * @notes 获取列表
      * @return array
@@ -55,7 +67,7 @@ class EngineerSettlementLists extends BaseAdminDataLists implements ListsSearchI
      */
     public function lists(): array
     {
-        return EngineerSettlement::where('is_export',2)->where($this->searchWhere)
+        return EngineerSettlement::where('is_export',2)->where($this->queryWhere())->where($this->searchWhere)
             ->field(['id', 'master_worker_id', 'worker_number', 'engineer_name', 'original_balance', 'total_settlement_amount', 'deduction_amount','deduction_describe', 'final_settlement_amount', 'settlement_time', 'settlement_details_remarks','batch_number'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
@@ -72,7 +84,7 @@ class EngineerSettlementLists extends BaseAdminDataLists implements ListsSearchI
      */
     public function count(): int
     {
-        return EngineerSettlement::where($this->searchWhere)->count();
+        return EngineerSettlement::where($this->searchWhere)->where($this->queryWhere())->count();
     }
 
 }