diff --git a/source/application/common/logic/PassFlow.php b/source/application/common/logic/PassFlow.php index f953b26..ba21ac4 100644 --- a/source/application/common/logic/PassFlow.php +++ b/source/application/common/logic/PassFlow.php @@ -298,19 +298,29 @@ class PassFlow $getGroup = $dm->find('bt_passenger_monitor_group',' "groupId" = ' . "'{$groupId}'"); $val['groupName'] = $getGroup['groupName'] ?: ''; + $val['sort']=intval($getGroup['sort']); $returnData[] = $val; } $libData = $dm->select('bt_library',['group_id' => ['baz001','BAF055']]); foreach ($libData as $libRow) { $libProportion = $libRow['today_incount'] > 0 ? round($libRow['today_incount']/$threshold,2) : 0; + // 文化馆排 4# 图书馆 2# + $isort = $libRow['group_id']=='baz001'?2:4; $returnData[] = [ 'allEnter' => $libRow['today_incount'] ?: 0, 'proportion' => ($libProportion * 100) . "%", 'congestion' => self::getPassType($libProportion), 'groupId' => $libRow['group_id'], - 'groupName' => $libRow['group_name'] + 'groupName' => $libRow['group_name'], + 'sort' => $isort, ]; } + // 排序 + $tmparr =[]; + foreach($returnData as $k=>$rv){ + $tmparr[$k]=$rv['sort']; + } + array_multisort($tmparr,SORT_ASC,$returnData); return $returnData; }