liugc преди 1 година
родител
ревизия
74b4cf780b

+ 11 - 2
app/adminapi/lists/sale/PropertyHeadAnalysisLists.php

@@ -39,12 +39,21 @@ class PropertyHeadAnalysisLists extends BaseAdminDataLists implements ListsSearc
     public function setSearch(): array
     {
         return [
-            '=' => ['sale_group_id', 'sale_name', 'mobile'],
+            '=' => ['sale_group_id', 'property_head_id','sale_type', 'sale_id'],
 
         ];
     }
 
-
+    public function queryWhere()
+    {
+        $where = [];
+        if(isset($this->params['time_range']) && $this->params['time_range']){
+            $startDateTime = strtotime($this->params['time_range'][0]);
+            $endDateTime = strtotime($this->params['time_range'][1])+86400-1;
+            $where[] = ['b.finished_time','BETWEEN',[$startDateTime,$endDateTime]];
+        }
+        return $where;
+    }
     /**
      * @notes 获取列表
      * @return array

+ 13 - 1
app/adminapi/lists/sale/SaleAnalysisLists.php

@@ -39,11 +39,21 @@ class SaleAnalysisLists extends BaseAdminDataLists implements ListsSearchInterfa
     public function setSearch(): array
     {
         return [
-            '=' => ['sale_group_id', 'sale_name', 'mobile'],
+            '=' => ['sale_group_id', 'property_head_id','sale_type', 'sale_id'],
 
         ];
     }
 
+    public function queryWhere()
+    {
+        $where = [];
+        if(isset($this->params['time_range']) && $this->params['time_range']){
+            $startDateTime = strtotime($this->params['time_range'][0]);
+            $endDateTime = strtotime($this->params['time_range'][1])+86400-1;
+            $where[] = ['b.finished_time','BETWEEN',[$startDateTime,$endDateTime]];
+        }
+        return $where;
+    }
 
     /**
      * @notes 获取列表
@@ -65,6 +75,7 @@ class SaleAnalysisLists extends BaseAdminDataLists implements ListsSearchInterfa
                                 SUM(CASE WHEN a.sale_type = 1 THEN b.work_amount ELSE 0 END) AS amount_sales_agent,
                                 SUM(CASE WHEN a.sale_type = 2 THEN b.work_amount ELSE 0 END) AS amount_sales_individual")
             ])
+            ->where($this->queryWhere())
             ->where('a.sale_type', 'in', [1, 2])
             ->where('a.order_status', 3)
             ->group('a.sale_id')
@@ -90,6 +101,7 @@ class SaleAnalysisLists extends BaseAdminDataLists implements ListsSearchInterfa
                                 SUM(CASE WHEN a.sale_type = 1 THEN b.work_amount ELSE 0 END) AS amount_sales_agent,
                                 SUM(CASE WHEN a.sale_type = 2 THEN b.work_amount ELSE 0 END) AS amount_sales_individual")
             ])
+            ->where($this->queryWhere())
             ->where('a.sale_type', 'in', [1, 2])
             ->where('a.order_status', 3)
             ->group('a.sale_id')

+ 11 - 2
app/adminapi/lists/sale/SaleGroupAnalysisLists.php

@@ -39,12 +39,21 @@ class SaleGroupAnalysisLists extends BaseAdminDataLists implements ListsSearchIn
     public function setSearch(): array
     {
         return [
-            '=' => ['sale_group_id', 'sale_name', 'mobile'],
+            '=' => ['sale_group_id', 'property_head_id','sale_type', 'sale_id'],
 
         ];
     }
 
-
+    public function queryWhere()
+    {
+        $where = [];
+        if(isset($this->params['time_range']) && $this->params['time_range']){
+            $startDateTime = strtotime($this->params['time_range'][0]);
+            $endDateTime = strtotime($this->params['time_range'][1])+86400-1;
+            $where[] = ['b.finished_time','BETWEEN',[$startDateTime,$endDateTime]];
+        }
+        return $where;
+    }
     /**
      * @notes 获取列表
      * @return array