From 8f09191633f1b4b3a954a008cb78bfd4ff57fa29 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Thu, 29 Mar 2018 17:25:39 +0800
Subject: [PATCH] 修正判断
---
Yfs/Domain/DataDaily.php | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/Yfs/Domain/DataDaily.php b/Yfs/Domain/DataDaily.php
index d952076..6f19bd8 100644
--- a/Yfs/Domain/DataDaily.php
+++ b/Yfs/Domain/DataDaily.php
@@ -31,13 +31,44 @@
$result = $this->model->getList(array('user_id' => $user_id, 'date' => array('$in' => $days_arr)));
}
else{
- $result = $this->hourly_model->getList(array('user_id' => $user_id, 'date' => $start_time), array(), array('time_level' => 1))
+ $result = $this->hourly_model->getList(array('user_id' => $user_id, 'date' => $start_time), array(), array('time_level' => 1));
}
return $result;
}
/**
+ * ������������������������������������������
+ * @param [type] $user_id [description]
+ * @param [type] $start_time [description]
+ * @param [type] $end_time [description]
+ * @return [type] [description]
+ */
+ public function getUserDataAvg($user_id, $start_time, $end_time){
+
+ if($start_time == $end_time){
+ $result = $this->model->get(array('date' => $start_time));
+ }
+ else{
+
+ $result = $this->model->aggregate(
+ array(
+ array(
+ '$match' => array('date' => array('$gte' => $start_time, '$lte' => $end_time), 'user_id' => $user_id)
+ ),
+ array(
+ '$group' => array('_id' => '$user_id', 'avg' => array('$avg' => '$day_avg'))
+ ),
+ array(
+ '$project' => array('_id' => 0, 'avg' => 1)
+ )
+ )
+ );
+ }
+ return $result[0]['avg'];
+ }
+
+ /**
* ������������
* @param [type] $start_time [description]
* @param [type] $end_time [description]
--
Gitblit v1.8.0