From bdbf4b25841603dcc953960757a43b0e172963b1 Mon Sep 17 00:00:00 2001 From: iotcat Date: Sat, 21 Sep 2019 00:01:09 +0800 Subject: [PATCH] auto update --- yimian/www/settlement/api/getWeekData.php | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/yimian/www/settlement/api/getWeekData.php b/yimian/www/settlement/api/getWeekData.php index 878b7bcf..6431eb57 100644 --- a/yimian/www/settlement/api/getWeekData.php +++ b/yimian/www/settlement/api/getWeekData.php @@ -33,20 +33,35 @@ while($row = $result->fetch_assoc()) { } +for($i = 0; $i < count($total_arr); $i ++){ + + if($total_arr[$i]['total'] == 0){ + $total_arr[$i]['total'] = getFirstTotal($total_arr); + }else{ + break; + } +} + for($i = 0; $i < count($total_arr); $i++){ if($i < count($total_arr) - 1) $total_arr[$i]['val'] = $total_arr[$i]['total'] - $total_arr[$i+1]['total']; else $total_arr[$i]['val'] = 0; } for($i = 0; $i < count($total_arr); $i ++){ - if($i < count($total_arr) - 7) $total_arr[$i]['week_val'] = $total_arr[$i]['total'] - $total_arr[$i+7]['total']; + if($i < count($total_arr) - 7) $total_arr[$i]['week_val'] = ($total_arr[$i]['total'] - $total_arr[$i+7]['total'])/7; else $total_arr[$i]['week_val'] = 0; } + echo json_encode(array( "code" => 200, "data" => $total_arr )); +function getFirstTotal($total_arr){ + $i = 0; + while(!$total_arr[$i++]['total'] && $i < count($total_arr)); + return $total_arr[$i-1]['total']; +}