From 3216159ba8eb5894196d375604e15172e0a9f3c5 Mon Sep 17 00:00:00 2001
From: lcc <805383944@qq.com>
Date: Mon, 20 Jan 2025 10:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=A5=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/controllers/receiver/Report.php | 7 ++++---
 api/controllers/plan/Report.php       | 3 ++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/admin/controllers/receiver/Report.php b/admin/controllers/receiver/Report.php
index be200cfe..ece5986d 100644
--- a/admin/controllers/receiver/Report.php
+++ b/admin/controllers/receiver/Report.php
@@ -25,15 +25,16 @@ class Report extends HD_Controller
         $params = $this->input->get();
         $params['page'] = $params['page'] ? intval($params['page']) : 1;
 
-        $biz_where = ['status' => 1, 'type' => 0, 'province_id' => 350000];
+//        $biz_where = ['status' => 1, 'type' => 0, 'province_id' => 350000];
+        $biz_where = ['status' => 1, 'type in (1,2)' => null, 'province_id' => 350000];
         $biz_lists = $this->biz_model->select($biz_where, '', 0, 0, 'id,biz_name');
-        $params['size'] = count($biz_lists);
+        $params['size'] = count($biz_lists) ?: 20;
         $lists = array();
 
         $where = ["status<>-1" => null];
         if ($params['day']) {
             $where['day'] = $params['day'];
-        }else{
+        } else {
             $where['day'] = date('Y-m-d', strtotime('yesterday'));
         }
 
diff --git a/api/controllers/plan/Report.php b/api/controllers/plan/Report.php
index 7731094f..9916eb99 100644
--- a/api/controllers/plan/Report.php
+++ b/api/controllers/plan/Report.php
@@ -6,6 +6,7 @@
 class Report extends HD_Controller
 {
     private $log_dir = 'biz_report';
+    private $biz_type = '1,2';
 
     public function __construct()
     {
@@ -46,7 +47,7 @@ class Report extends HD_Controller
 
         $where = array(
             'status' => 1,
-            'type' => 0,
+            "type in ({$this->biz_type})" => null,
             'province_id' => 350000
         );
         $bizs = $this->biz_model->select($where, '', $page, $size, 'id, biz_name');