From 30c9352f5cb01e5a3b5fcbbb9d6216f461a066d0 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Sat, 29 Jul 2023 00:38:28 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A4=E6=96=AD=E7=BB=9F=E8=AE=A1=E7=BB=84?=
 =?UTF-8?q?=E6=98=AF=E5=90=A6=E4=B8=BA=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/application/common/logic/PassFlow.php | 34 +++++++++++---------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/source/application/common/logic/PassFlow.php b/source/application/common/logic/PassFlow.php
index 95695c1..7f8159d 100644
--- a/source/application/common/logic/PassFlow.php
+++ b/source/application/common/logic/PassFlow.php
@@ -38,7 +38,7 @@ class PassFlow
             $where       .= $where ? ' and "granularity" = ' . "'hourly'" : ' "granularity" = ' . "'hourly'";
             $where       .= ' and "statTime" >= ' . "'{$start_time}'" . ' and "statTime" <= ' . "'{$end_time}'";
             $list        = $dm->select('bt_passenger_flow', $where);
-            $data        = self::handleGroupData($list,'H:00',$dm);
+            $data        = self::handleGroupData($list,'H:00',$dm,$groupsId);
             $allTimeData = $data['allTimeData'];
             $groupsData  = $data['groupsData'];
             $dkeys       = $data['dkeys'];
@@ -49,7 +49,7 @@ class PassFlow
             $where       .= $where ? ' and "granularity" = ' . "'daily'" : ' "granularity" = ' . "'daily'";
             $where       .= ' and "statTime" >= ' . "'{$start_time}'" . ' and "statTime" <= ' . "'{$end_time}'";
             $list        = $dm->select('bt_passenger_flow', $where);
-            $data        = self::handleGroupData($list, 'd',$dm);
+            $data        = self::handleGroupData($list, 'd',$dm,$groupsId);
             $allTimeData = $data['allTimeData'];
             $groupsData  = $data['groupsData'];
             $dkeys       = $data['dkeys'];
@@ -60,7 +60,7 @@ class PassFlow
             $where       .= $where ? ' and "granularity" = ' . "'monthly'" : ' "granularity" = ' . "'monthly'";
             $where       .= ' and "statTime" >= ' . "'{$start_time}'" . ' and "statTime" <= ' . "'{$end_time}'";
             $list        = $dm->select('bt_passenger_flow', $where);
-            $data        = self::handleGroupData($list, 'm',$dm);
+            $data        = self::handleGroupData($list, 'm',$dm,$groupsId);
             $allTimeData = $data['allTimeData'];
             $groupsData  = $data['groupsData'];
             $dkeys       = $data['dkeys'];
@@ -111,7 +111,7 @@ class PassFlow
      * @param $date_str
      * @return array
      */
-    protected static function handleGroupData($list,$date_str = 'H:00',$dm = null) {
+    protected static function handleGroupData($list,$date_str = 'H:00',$dm = null,$groupsId = '') {
         $allTimeData = [];
         $groupsData = [];
         $dkey=[];
@@ -152,17 +152,19 @@ class PassFlow
         }
         ksort($allTimeData);
 
-        $res = $dm->select('bt_library',['group_id' => ['baz001','BAF055']]);
-        foreach ($res as $row) {
-            if ($date_str == 'H:00') {
-                $sumNoRepeatInNum += $row['today_incount'];
-                $groupsData[$row['group_name']]['noRepeatInNum'] = $row['today_incount'];
-            } elseif ($date_str == 'd') {
-                $sumNoRepeatInNum += $row['month_incount'];
-                $groupsData[$row['group_name']]['noRepeatInNum'] = $row['month_incount'];
-            } elseif ($date_str == 'm') {
-                $sumNoRepeatInNum += $row['year_incount'];
-                $groupsData[$row['group_name']]['noRepeatInNum'] = $row['year_incount'];
+        if (empty($groupsId)) {
+            $res = $dm->select('bt_library',['group_id' => ['baz001','BAF055']]);
+            foreach ($res as $row) {
+                if ($date_str == 'H:00') {
+                    $sumNoRepeatInNum += $row['today_incount'];
+                    $groupsData[$row['group_name']]['noRepeatInNum'] = $row['today_incount'];
+                } elseif ($date_str == 'd') {
+                    $sumNoRepeatInNum += $row['month_incount'];
+                    $groupsData[$row['group_name']]['noRepeatInNum'] = $row['month_incount'];
+                } elseif ($date_str == 'm') {
+                    $sumNoRepeatInNum += $row['year_incount'];
+                    $groupsData[$row['group_name']]['noRepeatInNum'] = $row['year_incount'];
+                }
             }
         }
         // 计算各组占比
@@ -455,7 +457,7 @@ class PassFlow
             if (!isset($returnData[$str])) $returnData[$str] = 0;
         }
         foreach ($list as $value) {
-            $date = date('H:00',strtotime($value['statTime']) + (8*3600));   // 各时间端进馆人数
+            $date = date('H:00',strtotime($value['statTime']));   // 各时间端进馆人数
             if (!isset($allTimeData[$date])) continue;
             $returnData[$date] += $value['flowInNum'];
         }