diff --git a/source/application/api/controller/pass/Create.php b/source/application/api/controller/pass/Create.php index 7ebcd57..13af68c 100644 --- a/source/application/api/controller/pass/Create.php +++ b/source/application/api/controller/pass/Create.php @@ -146,8 +146,8 @@ class Create extends Controller ], ]; - $val['flowInNum'] = bcadd($val['flowInNum'],$mergeData[$val['groupId']]['flowInNum']); - $val['noRepeatInNum'] = bcadd($val['noRepeatInNum'],$mergeData[$val['groupId']]['noRepeatInNum']); + $val['flowInNum'] = round($val['flowInNum']+$mergeData[$val['groupId']]['flowInNum']); + $val['noRepeatInNum'] = round($val['noRepeatInNum']+$mergeData[$val['groupId']]['noRepeatInNum']); } } diff --git a/source/application/common/logic/PassFlow.php b/source/application/common/logic/PassFlow.php index 31c844c..e3c50b4 100644 --- a/source/application/common/logic/PassFlow.php +++ b/source/application/common/logic/PassFlow.php @@ -320,7 +320,13 @@ 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()); + $libraryDataYearWhere = ' "date" = ' . "'year'" . ' and "group_id" = ' . "'lib001'" . ' and "create_time" >= ' . "'{$start}'" . ' and "create_time" <= ' . "'{$end}'"; + $libraryDataYear = $dm->find('bt_library_data',$libraryDataYearWhere); + $returnData['year']['noRepeatInNum'] += isset($libraryDataYear['incount']) ? $libraryDataYear['incount'] : 0; + // $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'); diff --git a/web/create_bt_library_data.php b/web/create_bt_library_data.php index 221bbc1..970afbf 100644 --- a/web/create_bt_library_data.php +++ b/web/create_bt_library_data.php @@ -58,17 +58,17 @@ for ($i = 1; $i <= $monthNum; $i++) { if ($i == 1) { # 减去假期 $temp_day = $day * 7; - $temp_count = bcsub($temp_count,$temp_day); + $temp_count = round($temp_count-$temp_day); } if ($i == 2) { # 减去未满30 $temp_day = $day * 2; - $temp_count = bcsub($temp_count,$temp_day); + $temp_count = round($temp_count-$temp_day); } # 每月数量 - $flowInNum = bcadd($count,$temp_count); + $flowInNum = round($count+$temp_count); $days = date('t', strtotime(2023 . '-' . $str . '-01')); $start = date("Y-{$str}-01 ") ."00:00:00"; @@ -81,7 +81,7 @@ for ($i = 1; $i <= $monthNum; $i++) { 'group_id' => $group_id, 'group_name' => $name, 'incount' => $flowInNum, - 'outcount' => bcadd($flowInNum,rand(0, 10)), + 'outcount' => round($flowInNum+rand(0, 10)), 'date' => 'month', 'create_time' => date("Y-{$str}-01 ") . "00:00:00", 'last_incount' => 0, @@ -124,8 +124,8 @@ $queryBaz = $dm->find("bt_library_data",$queryWhereBaz); if ($queryBaz) { $baz001 = [ - 'incount' => bcadd($queryBaz['incount'],$countBaz['baz001']['incount']), - 'outcount' => bcadd($queryBaz['outcount'],$countBaz['baz001']['outcount']) + 'incount' => round($queryBaz['incount']+$countBaz['baz001']['incount']), + 'outcount' => round($queryBaz['outcount']+$countBaz['baz001']['outcount']) ]; $dm->update('bt_library_data',$baz001,'"id" = ' . "'{$queryBaz['id']}'"); } @@ -137,8 +137,8 @@ $queryBaf = $dm->find("bt_library_data",$queryWhereBaf); if ($queryBaf) { $BAF055 = [ - 'incount' => bcadd($queryBaf['incount'],$countBaz['BAF055']['incount']), - 'outcount' => bcadd($queryBaf['outcount'],$countBaz['BAF055']['outcount']) + 'incount' => round($queryBaf['incount']+$countBaz['BAF055']['incount']), + 'outcount' => round($queryBaf['outcount']+$countBaz['BAF055']['outcount']) ]; $dm->update('bt_library_data',$BAF055,'"id" = ' . "'{$queryBaf['id']}'"); } diff --git a/web/create_pass_all.php b/web/create_pass_all.php index a5bd892..747099a 100644 --- a/web/create_pass_all.php +++ b/web/create_pass_all.php @@ -71,19 +71,19 @@ foreach ($groupArr as $groupId => $val) { if ($i == 1) { # 减去假期 $temp_day = $day * 7; - $temp_count = bcsub($temp_count,$temp_day); + $temp_count = round($temp_count-$temp_day); } if ($i == 2) { # 减去未满30 $temp_day = $day * 2; - $temp_count = bcsub($temp_count,$temp_day); + $temp_count = round($temp_count-$temp_day); } # 每月数量 - $flowInNum = bcadd($count,$temp_count); + $flowInNum = round($count+$temp_count); - $sumFlowInNum = bcadd($sumFlowInNum,$flowInNum); + $sumFlowInNum = round($sumFlowInNum+$flowInNum); $iStr = strlen($i) == 1 ? '0'.$i : $i; @@ -166,8 +166,8 @@ foreach ($groupArr as $groupId => $val) { // $returnDataAll[] = $iArrSumAll; $updateAll = [ - 'flowInNum' => bcadd($querySumAll['flowInNum'],$sumFlowInNum), - 'noRepeatInNum' => bcadd($querySumAll['noRepeatInNum'],$sumFlowInNum), + 'flowInNum' => round($querySumAll['flowInNum']+$sumFlowInNum), + 'noRepeatInNum' => round($querySumAll['noRepeatInNum']+$sumFlowInNum), ]; $dm->update('bt_passenger_flow_all',$updateAll,'"id" = ' . "'{$querySumAll['id']}'"); @@ -195,8 +195,8 @@ foreach ($groupArr as $groupId => $val) { // // $returnData[] = $iArrSum; $update = [ - 'flowInNum' => bcadd($querySum['flowInNum'],$sumFlowInNum), - 'noRepeatInNum' => bcadd($querySum['noRepeatInNum'],$sumFlowInNum), + 'flowInNum' => round($querySum['flowInNum']+$sumFlowInNum), + 'noRepeatInNum' => round($querySum['noRepeatInNum']+$sumFlowInNum), ]; $dm->update('bt_passenger_flow',$update,'"id" = ' . "'{$querySum['id']}'");