优化中部数据总数

source/application/api/controller/pass/Passcc.php

@@ -120,6 +120,9 @@ class Passcc extends Controller
         $dateArr = ['day' => 'daily', 'week' => 'daily', 'month' => 'monthly', 'year' => 'yearly'];
 
         $returnData = [];
+        $y = date("Y");
+        # 总进馆人数
+        $yearSum = 0;
         foreach ($dateArr as $date => $granularity) {
 
             $list = Db::table('bt_passenger_flow_all')
@@ -127,9 +130,16 @@ class Passcc extends Controller
 
             $returnData[$date]['noRepeatInNum'] = 0;
             foreach ($list as $value) {
-                $returnData[$date]['noRepeatInNum'] += $value['noRepeatInNum'];
+                if ($date == 'year') {
+                    $yearSum += $value['noRepeatInNum'];
+                    $yDate = date('Y',ceil($value['createTime'] / 1000));   // 各今年端进馆人数
+                    if ($y == $yDate) $returnData[$date]['noRepeatInNum'] += $value['noRepeatInNum'];
+                } else {
+                    $returnData[$date]['noRepeatInNum'] += $value['noRepeatInNum'];
+                }
             }
         }
+        $returnData['sumYear']['noRepeatInNum'] = $yearSum;
 
         foreach ($returnData as &$val) {
             $val['noRepeatInNum'] = formatNumber($val['noRepeatInNum']);