判断统计组是否为空

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,6 +152,7 @@ class PassFlow
         }
         ksort($allTimeData);
 
+        if (empty($groupsId)) {
             $res = $dm->select('bt_library',['group_id' => ['baz001','BAF055']]);
             foreach ($res as $row) {
                 if ($date_str == 'H:00') {
@@ -165,6 +166,7 @@ class PassFlow
                     $groupsData[$row['group_name']]['noRepeatInNum'] = $row['year_incount'];
                 }
             }
+        }
         // 计算各组占比
         foreach ($groupsData as &$val) {
             $val['proportion'] = $val['noRepeatInNum'] > 0 ? (round($val['noRepeatInNum']/$sumNoRepeatInNum,2) * 100) ."%" : '0%';
@@ -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'];
         }