From 37b711cad47f0475692b4a0b3b7ae3f02e6bc779 Mon Sep 17 00:00:00 2001
From: colly_wyx <wangyixiong_007@163.com>
Date: Wed, 09 May 2018 16:02:24 +0800
Subject: [PATCH] 调整方法

---
 application/library/Service/Task.php |   21 +++++++++++----------
 1 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/library/Service/Task.php b/application/library/Service/Task.php
index ad9232f..9c940e3 100644
--- a/application/library/Service/Task.php
+++ b/application/library/Service/Task.php
@@ -18,20 +18,21 @@
 			$time_slot_arr = array();
 			for($time_slot = 1; $time_slot<=8 ; $time_slot++){
 				
-				$hour = ($time_slot - 1)*3;			
-				$start_hour = $hour.':00:00';
-				$end_hour = ($hour + 3).':00:00';
-				if($hour < 10 ){
-					$start_hour = '0'.$start_hour;
-				}
-				if($hour + 2 < 10){
-					$end_hour = '0'.$end_hour;
-				}
+				$min_hour = ($time_slot - 1)*3;
+				$max_hour = $time_slot * 3;		
+				// $start_hour = $hour.':00:00';
+				// $end_hour = ($hour + 3).':00:00';
+				// if($hour < 10 ){
+				// 	$start_hour = '0'.$start_hour;
+				// }
+				// if($hour + 2 < 10){
+				// 	$end_hour = '0'.$end_hour;
+				// }
 				echo '���������'.$day.' ������������'.$start_hour.'---'.$end_hour."======".$user_id."<br />";
 				$hourly_data = $hourly_model->aggregate(
 					array(
 						array(
-							'$match' => array('create_time' => array('$gte' => $day.' '.$start_hour, '$lt' => $day.' '.$end_hour), 'user_id' => $user_id)
+							'$match' => array('hour' => array('$gte' => $min_hour, '$lt' => $max_hour, 'user_id' => $user_id, 'data' => $day)
 						),
 						array(
 							'$group' => array('_id' => '$user_id', 'avg' => array('$avg' => '$value'))

--
Gitblit v1.8.0