From 38d32cf992f9d5aa822bab85281b509a269bf113 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 29 Mar 2018 17:20:51 +0800
Subject: [PATCH] 增加平均值及状态
---
Yfs/Api/Data.php | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 36c1ee3..8b0a200 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -60,8 +60,21 @@
if($this->start_time == $this->end_time || $data_daily_service->checkTime($this->start_time, $this->end_time)){
$result = $data_daily_service->getUserDataList($this->user_id, $this->start_time, $this->end_time);
if($result){
+ $res_avg = $data_daily_service->getUserDataAvg($this->user_id, $this->start_time, $this->end_time);
+ if($res_avg < 0.25){
+ $res_status = '������';
+ }
+ elseif($res_avg >= 0.25 && $res_avg < 0.8){
+ $res_status = '������';
+ }
+ elseif($res_avg >= 8 && $res_avg < 2){
+ $res_status = '������';
+ }
+ else{
+ $res_status = '������';
+ }
$rs['msg'] = '������������������';
- $rs['info'] = $result;
+ $rs['info'] = array('data' => $result, 'avg' => $res_avg, 'status' => $res_status);
}
else{
$rs['msg'] = '������������';
--
Gitblit v1.8.0