同步线上版本PassFlow2

source/application/common/logic/PassFlow.php

@@ -46,7 +46,7 @@ class PassFlow
     {
 
         $granularity = $param['granularity'];
-        $type    = isset($param['type']) ?$param['type']:'';
+        $type    = isset($param['type'])?$param['type']:'';
 
         if (empty($granularity)) return ['code' => 0, 'msg' => '缺少参数：granularity'];
         if (!in_array($granularity,self::$granularity)) return ['code' => 0, 'msg' => '参数错误：granularity'];
@@ -148,7 +148,7 @@ class PassFlow
         $groupsData = [];
         $dkey=[];
         if ($date_str == 'H:00') {
-	        $hour = (int) date('H');
+            $hour = (int) date('H');
             for ($i = 0; $i <= $hour; $i++) {
                 $str = strlen($i) == 1 ? '0'.$i.':00' : $i.':00';
                 $allTimeData[$str]['num'] = 0;
@@ -321,6 +321,7 @@ class PassFlow
             $mData = $dm->find('bt_library',['group_id' => 'lib001']);
             $returnData['day']['noRepeatInNum'] += isset($mData['today_incount']) ? $mData['today_incount'] : 0;
             $returnData['month']['noRepeatInNum'] += isset($mData['month_incount']) ? $mData['month_incount'] : 0;
+            //$returnData['year']['noRepeatInNum'] += isset($mData['year_incount']) ? $mData['year_incount'] : 0;
 
             $start = date("Y-01-01 00:00:00",time());
             $end = date("Y-12-31 23:59:59",time());
@@ -330,7 +331,7 @@ class PassFlow
 
 //            $returnData['sumYear']['noRepeatInNum'] += isset($mData['year_incount']) ? $mData['year_incount'] : 0;
             # 文化总年度
-            #$libraryData = $dm->find('bt_library_data',['group_id' => 'lib001','date' => 'year'],'SUM("incount") as NUM');
+            # $libraryData = $dm->find('bt_library_data',['group_id' => 'lib001','date' => 'year'],'SUM("incount") as NUM');
             $returnData['sumYear']['noRepeatInNum'] += isset($libraryDataYear['incount']) ? $libraryDataYear['incount'] : 0;
             $week_start =  date("Y-m-d 00:00:00",strtotime('this week'));
             $week_end =  date("Y-m-d 23:59:59",strtotime("-".(date("w") - 7) . "day"));
@@ -355,7 +356,7 @@ class PassFlow
     public static function realTimeData($dm = null)
     {
         if (empty($dm)) $dm = new Dm();
-        
+
         $list = $dm->select('bt_passenger_flow_real');
         $data = [];
 
@@ -390,6 +391,7 @@ class PassFlow
             $val['sort']=intval($getGroup['sort']);
             $returnData[] = $val;
         }
+
         $libData = $dm->select('bt_library',['group_id' => ['baz001','BAF055']]);
         foreach ($libData as $libRow) {
             $holdValue = abs($libRow['today_incount'] - $libRow['today_outcount']);
@@ -521,9 +523,9 @@ class PassFlow
                 'list' => $listData
             ];
         }
-	if(empty($groupsId)){
-	   $data = self::getLibraryGroupHoursList($dm,false,$data);
-	}
+        if(empty($groupsId)){
+            $data = self::getLibraryGroupHoursList($dm,false,$data);
+        }
         return $data;
     }