From f716003ce965eddf14c9cf0470708ec9bf4a9a45 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Wed, 18 Apr 2018 09:14:55 +0800
Subject: [PATCH] 修正参数错误
---
Yfs/Api/Data.php | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/Yfs/Api/Data.php b/Yfs/Api/Data.php
index 0c5a80a..8b311c8 100644
--- a/Yfs/Api/Data.php
+++ b/Yfs/Api/Data.php
@@ -57,15 +57,28 @@
public function getUserDataList(){
$rs = array('code' => 0, 'msg' => '', 'info' => array());
$data_daily_service = new Domain_DataDaily();
- if($data_daily_service->checkTime($this->start_time, $this->end_time)){
+ 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 >= 0.8 && $res_avg < 2){
+ $res_status = '������';
+ }
+ else{
+ $res_status = '������';
+ }
$rs['msg'] = '������������������';
- $rs['info'] = $data_list;
+ $rs['info'] = array('data' => $result, 'avg' => $res_avg, 'status' => $res_status);
}
else{
- $rs['code'] = 1;
- $rs['msg'] = '������������������';
+ $rs['msg'] = '������������';
+ $rs['info'] = array('data' => array(), 'avg' => 0, 'status' => '������');
}
}
else{
--
Gitblit v1.8.0