From 360b30a72f8600311a9cd18a9ca2fb44e336d5b0 Mon Sep 17 00:00:00 2001
From: wanghongjun <1445693971@qq,com>
Date: Sat, 29 Jul 2023 01:16:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=8A=E6=97=A5=E5=90=84=E5=9C=BA=E9=A6=86?=
 =?UTF-8?q?=E4=BA=BA=E6=95=B0=E8=B6=8B=E5=8A=BF-=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=90=84=E7=BB=84=E5=88=9D=E5=A7=8B=E6=95=B0=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 source/application/common/logic/PassFlow.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/source/application/common/logic/PassFlow.php b/source/application/common/logic/PassFlow.php
index 7f8159d..84ac55d 100644
--- a/source/application/common/logic/PassFlow.php
+++ b/source/application/common/logic/PassFlow.php
@@ -321,9 +321,11 @@ class PassFlow
         if (empty($dm)) $dm = new Dm();
 
         $where = ' "granularity"='."'hourly' ";
+        $groupsWhere = null;
         if (!empty($param)) {
             if (!empty($param['groupsId'])) {
                 $groupsId = explode("|",$param['groupsId']);
+                $groupsWhere = ['groupId' => $groupsId];
                 $where .= ' and "groupId" in (' . "'" . implode("','",$groupsId) . "')";
             }
         }
@@ -338,6 +340,15 @@ class PassFlow
             $allTimeData[$str] = 0;
         }
         $returnData = [];
+
+        # 获取各组初始数值
+        $groupData = $dm->select('bt_passenger_monitor_group',$groupsWhere);
+        foreach ($groupData as $groupDataRow) {
+            foreach ($allTimeData as $date => $dateValue) {
+                $returnData[$groupDataRow['groupName']][$date] = $dateValue;
+            }
+        }
+
         foreach ($list as $value) {
             $date = date('H:00',ceil($value['createTime'] / 1000));   // 各时间端进馆人数
             if (!isset($allTimeData[$date])) continue;